[clang][bytcode] Convert Fixed Point values to target semantics... #110411
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
... after a binary operation. The Result of the operation is in the common semantics of RHS and LHS, so we need to convert that to the semantics of the BinaryOperator expression.
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Timm Baeder (tbaederr) Changes... after a binary operation. The Result of the operation is in the common semantics of RHS and LHS, so we need to convert that to the semantics of the BinaryOperator expression. Full diff: https://github.com/llvm/llvm-project/pull/110411.diff 3 Files Affected:
diff --git a/clang/lib/AST/ByteCode/Compiler.cpp b/clang/lib/AST/ByteCode/Compiler.cpp
index 3a3ee3b577c29c..44195a3dc33de4 100644
--- a/clang/lib/AST/ByteCode/Compiler.cpp
+++ b/clang/lib/AST/ByteCode/Compiler.cpp
@@ -1502,25 +1502,41 @@ bool Compiler<Emitter>::VisitFixedPointBinOp(const BinaryOperator *E) {
assert(LHS->getType()->isFixedPointType() ||
RHS->getType()->isFixedPointType());
+ auto LHSSema = Ctx.getASTContext().getFixedPointSemantics(LHS->getType());
+ auto RHSSema = Ctx.getASTContext().getFixedPointSemantics(RHS->getType());
+
if (!this->visit(LHS))
return false;
if (!LHS->getType()->isFixedPointType()) {
- auto Sem = Ctx.getASTContext().getFixedPointSemantics(LHS->getType());
uint32_t I;
- std::memcpy(&I, &Sem, sizeof(Sem));
+ std::memcpy(&I, &LHSSema, sizeof(llvm::FixedPointSemantics));
if (!this->emitCastIntegralFixedPoint(classifyPrim(LHS->getType()), I, E))
return false;
}
+
if (!this->visit(RHS))
return false;
if (!RHS->getType()->isFixedPointType()) {
- auto Sem = Ctx.getASTContext().getFixedPointSemantics(RHS->getType());
uint32_t I;
- std::memcpy(&I, &Sem, sizeof(Sem));
+ std::memcpy(&I, &RHSSema, sizeof(llvm::FixedPointSemantics));
if (!this->emitCastIntegralFixedPoint(classifyPrim(RHS->getType()), I, E))
return false;
}
+ // Convert the result to the target semantics.
+ auto ConvertResult = [&](bool R) -> bool {
+ if (!R)
+ return false;
+ auto ResultSema = Ctx.getASTContext().getFixedPointSemantics(E->getType());
+ auto CommonSema = LHSSema.getCommonSemantics(RHSSema);
+ if (ResultSema != CommonSema) {
+ uint32_t I;
+ std::memcpy(&I, &ResultSema, sizeof(ResultSema));
+ return this->emitCastFixedPoint(I, E);
+ }
+ return true;
+ };
+
switch (E->getOpcode()) {
case BO_EQ:
return this->emitEQFixedPoint(E);
@@ -1537,7 +1553,7 @@ bool Compiler<Emitter>::VisitFixedPointBinOp(const BinaryOperator *E) {
return this->emitGEFixedPoint(E);
#endif
case BO_Add:
- return this->emitAddFixedPoint(E);
+ return ConvertResult(this->emitAddFixedPoint(E));
default:
return this->emitInvalid(E);
diff --git a/clang/lib/AST/ByteCode/Interp.h b/clang/lib/AST/ByteCode/Interp.h
index fd09deb87d4c51..89635f9c61e932 100644
--- a/clang/lib/AST/ByteCode/Interp.h
+++ b/clang/lib/AST/ByteCode/Interp.h
@@ -2177,7 +2177,8 @@ inline bool CastFixedPoint(InterpState &S, CodePtr OpPC, uint32_t FPS) {
E->getExprLoc(), diag::warn_fixedpoint_constant_overflow)
<< Result.toDiagnosticString(S.getASTContext()) << E->getType();
}
- S.CCEDiag(E, diag::note_constexpr_overflow) << Result << E->getType();
+ S.CCEDiag(E, diag::note_constexpr_overflow)
+ << Result.toDiagnosticString(S.getASTContext()) << E->getType();
if (!S.noteUndefinedBehavior())
return false;
}
diff --git a/clang/test/AST/ByteCode/fixed-point.cpp b/clang/test/AST/ByteCode/fixed-point.cpp
index dd360382e7ca21..d515b7fe1594a9 100644
--- a/clang/test/AST/ByteCode/fixed-point.cpp
+++ b/clang/test/AST/ByteCode/fixed-point.cpp
@@ -42,10 +42,8 @@ namespace BinOps {
static_assert(1 + A == 14.0k);
static_assert((A + A) == 26);
- /// FIXME: Conversion between fixed point semantics.
- static_assert(A + 100000 == 14.0k); // expected-error {{static assertion failed}} \
- // ref-error {{is not an integral constant expression}} \
- // ref-note {{is outside the range of representable values}}
+ static_assert(A + 100000 == 14.0k); // both-error {{is not an integral constant expression}} \
+ // both-note {{is outside the range of representable values}}
}
namespace FixedPointCasts {
|
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/88/builds/2922 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
... after a binary operation. The Result of the operation is in the common semantics of RHS and LHS, so we need to convert that to the semantics of the BinaryOperator expression.