https://github.com/tbaederr updated https://github.com/llvm/llvm-project/pull/79130
>From db25ed3917079ea9bf3c05a899b40415e3c5df8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbae...@redhat.com> Date: Tue, 23 Jan 2024 09:14:02 +0100 Subject: [PATCH] [clang][Interp] Handle imaginary literals Initialize the first element to 0 and the second element to the value of the subexpression. --- clang/lib/AST/Interp/ByteCodeExprGen.cpp | 26 ++++++++++++++++++++++++ clang/lib/AST/Interp/ByteCodeExprGen.h | 1 + clang/lib/AST/Interp/Context.cpp | 8 +++++--- clang/test/AST/Interp/complex.cpp | 8 ++++++++ 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/clang/lib/AST/Interp/ByteCodeExprGen.cpp b/clang/lib/AST/Interp/ByteCodeExprGen.cpp index d2d47e60b2c4d..aa21b4e7da6e8 100644 --- a/clang/lib/AST/Interp/ByteCodeExprGen.cpp +++ b/clang/lib/AST/Interp/ByteCodeExprGen.cpp @@ -393,6 +393,31 @@ bool ByteCodeExprGen<Emitter>::VisitFloatingLiteral(const FloatingLiteral *E) { return this->emitConstFloat(E->getValue(), E); } +template <class Emitter> +bool ByteCodeExprGen<Emitter>::VisitImaginaryLiteral( + const ImaginaryLiteral *E) { + assert(E->getType()->isAnyComplexType()); + if (DiscardResult) + return true; + + if (!Initializing) { + std::optional<unsigned> LocalIndex = allocateLocal(E, /*IsExtended=*/false); + if (!LocalIndex) + return false; + if (!this->emitGetPtrLocal(*LocalIndex, E)) + return false; + } + + const Expr *SubExpr = E->getSubExpr(); + PrimType SubExprT = classifyPrim(SubExpr->getType()); + + if (!this->visitZeroInitializer(SubExprT, SubExpr->getType(), SubExpr)) + return false; + if (!this->emitInitElem(SubExprT, 0, SubExpr)) + return false; + return this->visitArrayElemInit(1, SubExpr); +} + template <class Emitter> bool ByteCodeExprGen<Emitter>::VisitParenExpr(const ParenExpr *E) { return this->delegate(E->getSubExpr()); @@ -2876,6 +2901,7 @@ bool ByteCodeExprGen<Emitter>::VisitUnaryOperator(const UnaryOperator *E) { return false; return this->visitZeroInitializer(*T, SubExpr->getType(), SubExpr); } + if (!this->visit(SubExpr)) return false; if (!this->emitConstUint8(1, E)) diff --git a/clang/lib/AST/Interp/ByteCodeExprGen.h b/clang/lib/AST/Interp/ByteCodeExprGen.h index 315169d487cd4..971fd09bdfac5 100644 --- a/clang/lib/AST/Interp/ByteCodeExprGen.h +++ b/clang/lib/AST/Interp/ByteCodeExprGen.h @@ -61,6 +61,7 @@ class ByteCodeExprGen : public ConstStmtVisitor<ByteCodeExprGen<Emitter>, bool>, bool VisitCastExpr(const CastExpr *E); bool VisitIntegerLiteral(const IntegerLiteral *E); bool VisitFloatingLiteral(const FloatingLiteral *E); + bool VisitImaginaryLiteral(const ImaginaryLiteral *E); bool VisitParenExpr(const ParenExpr *E); bool VisitBinaryOperator(const BinaryOperator *E); bool VisitLogicalBinOp(const BinaryOperator *E); diff --git a/clang/lib/AST/Interp/Context.cpp b/clang/lib/AST/Interp/Context.cpp index ba80a015965b3..5f5a6622f10f3 100644 --- a/clang/lib/AST/Interp/Context.cpp +++ b/clang/lib/AST/Interp/Context.cpp @@ -111,11 +111,13 @@ bool Context::evaluateAsInitializer(State &Parent, const VarDecl *VD, #endif // Ensure global variables are fully initialized. - if (shouldBeGloballyIndexed(VD) && !Res.isInvalid() && - (VD->getType()->isRecordType() || VD->getType()->isArrayType())) { + if (shouldBeGloballyIndexed(VD) && + (VD->getType()->isRecordType() || VD->getType()->isArrayType() || + VD->getType()->isAnyComplexType())) { assert(Res.isLValue()); - if (!Res.checkFullyInitialized(C.getState())) + if (!VD->getType()->isAnyComplexType() && + !Res.checkFullyInitialized(C.getState())) return false; // lvalue-to-rvalue conversion. diff --git a/clang/test/AST/Interp/complex.cpp b/clang/test/AST/Interp/complex.cpp index 8c57df7d9a3ed..275d066bbb3aa 100644 --- a/clang/test/AST/Interp/complex.cpp +++ b/clang/test/AST/Interp/complex.cpp @@ -61,6 +61,14 @@ static_assert(__real(D3) == 1.0, ""); static_assert(__imag(D3) == 3.0, ""); +constexpr _Complex int a = 2i; +static_assert(__real(a) == 0, ""); +static_assert(__imag(a) == 2, ""); + +constexpr _Complex double b = 4.0i; +static_assert(__real(b) == 0, ""); +static_assert(__imag(b) == 4, ""); + constexpr int ignored() { I2; (int)I2; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits