tbaeder created this revision.
tbaeder added reviewers: aaron.ballman, erichkeane, tahonermann, shafik.
Herald added a project: All.
tbaeder requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Otherwise, we run into an assertion when trying to use the current
variable scope while creating temporaries for constructor initializers.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D147534
Files:
clang/lib/AST/Interp/ByteCodeStmtGen.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
@@ -252,6 +252,26 @@
constexpr S s;
static_assert(s.m() == 1, "");
+namespace InitializerTemporaries {
+ class Bar {
+ private:
+ int a;
+
+ public:
+ constexpr Bar() : a(10) {}
+ constexpr int getA() const { return a; }
+ };
+
+ class Foo {
+ public:
+ int a;
+
+ constexpr Foo() : a(Bar().getA()) {}
+ };
+ constexpr Foo F;
+ static_assert(F.a == 10, "");
+}
+
#if __cplusplus >= 201703L
namespace BaseInit {
class _A {public: int a;};
Index: clang/lib/AST/Interp/ByteCodeStmtGen.cpp
===================================================================
--- clang/lib/AST/Interp/ByteCodeStmtGen.cpp
+++ clang/lib/AST/Interp/ByteCodeStmtGen.cpp
@@ -94,6 +94,9 @@
// Classify the return type.
ReturnType = this->classify(F->getReturnType());
+ // Scope needed for the initializers.
+ BlockScope<Emitter> Scope(this);
+
// Constructor. Set up field initializers.
if (const auto Ctor = dyn_cast<CXXConstructorDecl>(F)) {
const RecordDecl *RD = Ctor->getParent();
Index: clang/test/AST/Interp/records.cpp
===================================================================
--- clang/test/AST/Interp/records.cpp
+++ clang/test/AST/Interp/records.cpp
@@ -252,6 +252,26 @@
constexpr S s;
static_assert(s.m() == 1, "");
+namespace InitializerTemporaries {
+ class Bar {
+ private:
+ int a;
+
+ public:
+ constexpr Bar() : a(10) {}
+ constexpr int getA() const { return a; }
+ };
+
+ class Foo {
+ public:
+ int a;
+
+ constexpr Foo() : a(Bar().getA()) {}
+ };
+ constexpr Foo F;
+ static_assert(F.a == 10, "");
+}
+
#if __cplusplus >= 201703L
namespace BaseInit {
class _A {public: int a;};
Index: clang/lib/AST/Interp/ByteCodeStmtGen.cpp
===================================================================
--- clang/lib/AST/Interp/ByteCodeStmtGen.cpp
+++ clang/lib/AST/Interp/ByteCodeStmtGen.cpp
@@ -94,6 +94,9 @@
// Classify the return type.
ReturnType = this->classify(F->getReturnType());
+ // Scope needed for the initializers.
+ BlockScope<Emitter> Scope(this);
+
// Constructor. Set up field initializers.
if (const auto Ctor = dyn_cast<CXXConstructorDecl>(F)) {
const RecordDecl *RD = Ctor->getParent();
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
