llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Eli Friedman (efriedma-quic) <details> <summary>Changes</summary> Transparent InitListExprs have different semantics, so special-case them in Expr::isConstantInitializer. We probably should move away from isConstantInitializer, in favor of relying more directly on constant evaluation, but this is an easy fix. Fixes #<!-- -->147949 --- Full diff: https://github.com/llvm/llvm-project/pull/148030.diff 3 Files Affected: - (modified) clang/lib/AST/Expr.cpp (+4) - (modified) clang/test/CodeGenCXX/const-init-cxx11.cpp (+9) - (modified) clang/test/SemaCXX/compound-literal.cpp (+8) ``````````diff diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp index 36fd5ee271e03..2e1a9a3d9ad63 100644 --- a/clang/lib/AST/Expr.cpp +++ b/clang/lib/AST/Expr.cpp @@ -3393,6 +3393,10 @@ bool Expr::isConstantInitializer(ASTContext &Ctx, bool IsForRef, // an anonymous union, in declaration order. const InitListExpr *ILE = cast<InitListExpr>(this); assert(ILE->isSemanticForm() && "InitListExpr must be in semantic form"); + + if (ILE->isTransparent()) + return ILE->getInit(0)->isConstantInitializer(Ctx, false, Culprit); + if (ILE->getType()->isArrayType()) { unsigned numInits = ILE->getNumInits(); for (unsigned i = 0; i < numInits; i++) { diff --git a/clang/test/CodeGenCXX/const-init-cxx11.cpp b/clang/test/CodeGenCXX/const-init-cxx11.cpp index 7c92af0def527..0795fb534af4b 100644 --- a/clang/test/CodeGenCXX/const-init-cxx11.cpp +++ b/clang/test/CodeGenCXX/const-init-cxx11.cpp @@ -638,6 +638,15 @@ struct PR69979 { const char (&d)[9]; } e {"12345678"}; +namespace GH147949 { + struct Coordinate {}; + Coordinate Make(); + void TestBody() { + // CHECK: call {{.*}} @_ZN8GH1479494MakeEv + const Coordinate x{Make()}; + } +} + // VirtualMembers::TemplateClass::templateMethod() must be defined in this TU, // not just declared. // CHECK: define linkonce_odr void @_ZN14VirtualMembers13TemplateClassIiE14templateMethodEv(ptr {{[^,]*}} %this) diff --git a/clang/test/SemaCXX/compound-literal.cpp b/clang/test/SemaCXX/compound-literal.cpp index a62e4f79b5a07..9c7c606838de9 100644 --- a/clang/test/SemaCXX/compound-literal.cpp +++ b/clang/test/SemaCXX/compound-literal.cpp @@ -129,3 +129,11 @@ int f(); #endif Foo o = (Foo){ {}, 1, f() }; } + +#if __cplusplus >= 201103L +namespace GH147949 { + // Make sure we handle transparent InitListExprs correctly. + struct S { int x : 3; }; + const S* x = (const S[]){S{S{3}}}; +} +#endif `````````` </details> https://github.com/llvm/llvm-project/pull/148030 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
