diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-02-17 00:44:16 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-02-17 00:44:16 +0000 |
| commit | ce582fe2a7aad8b14b3636ad9cac0a3b8bbb219b (patch) | |
| tree | b7c2066359564a33dd23dc3fdb171ce9cbc39165 | |
| parent | df79567796fabb406156d881ebd3319aa55b6f83 (diff) | |
PR12012: Fix a regression in r150419 where we would try (and fail) to
zero-initialize class types with virtual bases when constant-evaluating an
initializer.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@150770 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/AST/ExprConstant.cpp | 5 | ||||
| -rw-r--r-- | test/CodeGenCXX/const-init-cxx11.cpp | 14 | ||||
| -rw-r--r-- | test/SemaCXX/constexpr-value-init.cpp | 6 |
3 files changed, 25 insertions, 0 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index 1a396e1425..0ef7111f97 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -3387,6 +3387,11 @@ bool RecordExprEvaluator::ZeroInitialization(const Expr *E) { return EvaluateInPlace(Result.getUnionValue(), Info, Subobject, &VIE); } + if (isa<CXXRecordDecl>(RD) && cast<CXXRecordDecl>(RD)->getNumVBases()) { + Info.Diag(E->getExprLoc(), diag::note_constexpr_virtual_base) << RD; + return false; + } + return HandleClassZeroInitialization(Info, E, RD, This, Result); } diff --git a/test/CodeGenCXX/const-init-cxx11.cpp b/test/CodeGenCXX/const-init-cxx11.cpp index 70fa2984fa..fa56f59808 100644 --- a/test/CodeGenCXX/const-init-cxx11.cpp +++ b/test/CodeGenCXX/const-init-cxx11.cpp @@ -279,3 +279,17 @@ namespace CrossFuncLabelDiff { // CHECK: sub nsw i64 ptrtoint (i8* blockaddress(@_ZN18CrossFuncLabelDiff4testEv, {{.*}}) to i64), // CHECK: store i64 {{.*}}, i64* @_ZZN18CrossFuncLabelDiff4testEvE1b, align 8 } + +// PR12012 +namespace VirtualBase { + struct B {}; + struct D : virtual B {}; + D d; + // CHECK: call {{.*}}@_ZN11VirtualBase1DC1Ev + + template<typename T> struct X : T { + constexpr X() : T() {} + }; + X<D> x; + // CHECK: call {{.*}}@_ZN11VirtualBase1XINS_1DEEC1Ev +} diff --git a/test/SemaCXX/constexpr-value-init.cpp b/test/SemaCXX/constexpr-value-init.cpp index db4b68dcc6..e459f097b9 100644 --- a/test/SemaCXX/constexpr-value-init.cpp +++ b/test/SemaCXX/constexpr-value-init.cpp @@ -29,3 +29,9 @@ constexpr D d1; // expected-error {{requires a user-provided default constructor constexpr D d2 = D(); // ok with DR1452 static_assert(D().c == 0, ""); static_assert(D().d == 0, ""); + +struct V : virtual C {}; +template<typename T> struct Z : T { + constexpr Z() : V() {} +}; +constexpr int n = Z<V>().c; // expected-error {{constant expression}} expected-note {{virtual base class}} |