tbaeder updated this revision to Diff 464618.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D135025/new/
https://reviews.llvm.org/D135025
Files:
clang/lib/AST/Interp/ByteCodeExprGen.cpp
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
@@ -1,9 +1,6 @@
// RUN: %clang_cc1 -fexperimental-new-constant-interpreter -verify %s
// RUN: %clang_cc1 -verify=ref %s
-// ref-no-diagnostics
-// expected-no-diagnostics
-
struct BoolPair {
bool first;
bool second;
@@ -157,3 +154,24 @@
static_assert(LT2.v[0].second == false, "");
static_assert(LT2.v[2].first == true, "");
static_assert(LT2.v[2].second == false, "");
+
+class Base {
+public:
+ int i;
+ constexpr Base() : i(10) {}
+ constexpr Base(int i) : i(i) {}
+};
+
+class A : public Base {
+public:
+ constexpr A() : Base(100) {}
+ constexpr A(int a) : Base(a) {}
+};
+constexpr A a{};
+static_assert(a.i == 100, "");
+constexpr A a2{12};
+static_assert(a2.i == 12, "");
+static_assert(a2.i == 200, ""); // ref-error {{static assertion failed}} \
+ // ref-note {{evaluates to '12 == 200'}} \
+ // expected-error {{static assertion failed}} \
+ // expected-note {{evaluates to '12 == 200'}}
Index: clang/lib/AST/Interp/ByteCodeStmtGen.cpp
===================================================================
--- clang/lib/AST/Interp/ByteCodeStmtGen.cpp
+++ clang/lib/AST/Interp/ByteCodeStmtGen.cpp
@@ -100,31 +100,45 @@
const Record *R = this->getRecord(RD);
for (const auto *Init : Ctor->inits()) {
- const FieldDecl *Member = Init->getMember();
const Expr *InitExpr = Init->getInit();
- const Record::Field *F = R->getField(Member);
-
- if (Optional<PrimType> T = this->classify(InitExpr->getType())) {
- if (!this->emitThis(InitExpr))
- return false;
-
- if (!this->visit(InitExpr))
- return false;
-
- if (!this->emitInitField(*T, F->Offset, InitExpr))
+ if (const FieldDecl *Member = Init->getMember()) {
+ const Record::Field *F = R->getField(Member);
+
+ if (Optional<PrimType> T = this->classify(InitExpr->getType())) {
+ if (!this->emitThis(InitExpr))
+ return false;
+
+ if (!this->visit(InitExpr))
+ return false;
+
+ if (!this->emitInitField(*T, F->Offset, InitExpr))
+ return false;
+ } else {
+ // Non-primitive case. Get a pointer to the field-to-initialize
+ // on the stack and call visitInitialzer() for it.
+ if (!this->emitThis(InitExpr))
+ return false;
+
+ if (!this->emitGetPtrField(F->Offset, InitExpr))
+ return false;
+
+ if (!this->visitInitializer(InitExpr))
+ return false;
+
+ if (!this->emitPopPtr(InitExpr))
+ return false;
+ }
+ } else if (const Type *Base = Init->getBaseClass()) {
+ // Base class initializer.
+ // Get This Base and call initializer on it.
+ auto *BaseDecl = Base->getAsCXXRecordDecl();
+ assert(F);
+ const Record::Base *B = R->getBase(BaseDecl);
+ assert(B);
+ if (!this->emitGetPtrThisBase(B->Offset, InitExpr))
return false;
- } else {
- // Non-primitive case. Get a pointer to the field-to-initialize
- // on the stack and call visitInitialzer() for it.
- if (!this->emitThis(InitExpr))
- return false;
-
- if (!this->emitGetPtrField(F->Offset, InitExpr))
- return false;
-
if (!this->visitInitializer(InitExpr))
return false;
-
if (!this->emitPopPtr(InitExpr))
return false;
}
Index: clang/lib/AST/Interp/ByteCodeExprGen.cpp
===================================================================
--- clang/lib/AST/Interp/ByteCodeExprGen.cpp
+++ clang/lib/AST/Interp/ByteCodeExprGen.cpp
@@ -107,6 +107,20 @@
});
}
+ case CK_UncheckedDerivedToBase: {
+ if (!this->visit(SubExpr))
+ return false;
+ const CXXRecordDecl *FromDecl = SubExpr->getType()->getAsCXXRecordDecl();
+ assert(FromDecl);
+ const CXXRecordDecl *ToDecl = CE->getType()->getAsCXXRecordDecl();
+ assert(ToDecl);
+ const Record *R = getRecord(FromDecl);
+ const Record::Base *ToBase = R->getBase(ToDecl);
+ assert(ToBase);
+
+ return this->emitGetPtrBase(ToBase->Offset, CE);
+ }
+
case CK_ArrayToPointerDecay:
case CK_AtomicToNonAtomic:
case CK_ConstructorConversion:
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
