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
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index 1a396e1..0ef7111 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -3387,6 +3387,11 @@
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);
}