This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rG90d921fa1f71: [clang][Interp] Handle record initialization via CastExpr (authored by tbaeder).
Changed prior to commit: https://reviews.llvm.org/D140808?vs=485781&id=501788#toc Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D140808/new/ https://reviews.llvm.org/D140808 Files: clang/lib/AST/Interp/ByteCodeExprGen.cpp clang/test/AST/Interp/records.cpp Index: clang/test/AST/Interp/records.cpp =================================================================== --- clang/test/AST/Interp/records.cpp +++ clang/test/AST/Interp/records.cpp @@ -88,6 +88,10 @@ // expected-error {{must be initialized by a constant expression}} \ // ref-error {{without a user-provided default constructor}} +constexpr Ints2 I2 = Ints2{12, 25}; +static_assert(I2.a == 12, ""); +static_assert(I2.b == 25, ""); + class C { public: int a; Index: clang/lib/AST/Interp/ByteCodeExprGen.cpp =================================================================== --- clang/lib/AST/Interp/ByteCodeExprGen.cpp +++ clang/lib/AST/Interp/ByteCodeExprGen.cpp @@ -1410,6 +1410,8 @@ return this->VisitCallExpr(CE); } else if (const auto *DIE = dyn_cast<CXXDefaultInitExpr>(Initializer)) { return this->visitInitializer(DIE->getExpr()); + } else if (const auto *CE = dyn_cast<CastExpr>(Initializer)) { + return this->visitInitializer(CE->getSubExpr()); } return false;
Index: clang/test/AST/Interp/records.cpp =================================================================== --- clang/test/AST/Interp/records.cpp +++ clang/test/AST/Interp/records.cpp @@ -88,6 +88,10 @@ // expected-error {{must be initialized by a constant expression}} \ // ref-error {{without a user-provided default constructor}} +constexpr Ints2 I2 = Ints2{12, 25}; +static_assert(I2.a == 12, ""); +static_assert(I2.b == 25, ""); + class C { public: int a; Index: clang/lib/AST/Interp/ByteCodeExprGen.cpp =================================================================== --- clang/lib/AST/Interp/ByteCodeExprGen.cpp +++ clang/lib/AST/Interp/ByteCodeExprGen.cpp @@ -1410,6 +1410,8 @@ return this->VisitCallExpr(CE); } else if (const auto *DIE = dyn_cast<CXXDefaultInitExpr>(Initializer)) { return this->visitInitializer(DIE->getExpr()); + } else if (const auto *CE = dyn_cast<CastExpr>(Initializer)) { + return this->visitInitializer(CE->getSubExpr()); } return false;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits