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 /lib/AST/ExprConstant.cpp | |
| 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
Diffstat (limited to 'lib/AST/ExprConstant.cpp')
| -rw-r--r-- | lib/AST/ExprConstant.cpp | 5 |
1 files changed, 5 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); } |