From 1de9d7de172379d6af75fd11dda2a713e4f36f62 Mon Sep 17 00:00:00 2001 From: John McCall Date: Thu, 26 Apr 2012 18:10:01 +0000 Subject: [PATCH] Fix a crash-on-invalid where the constant evaluator would try to evaluate certain expressions involving invalidly-defined classes. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155645 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AST/ExprConstant.cpp | 5 +++++ test/SemaCXX/constant-expression.cpp | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index 818548127c..2edf4ff335 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -3408,6 +3408,7 @@ static bool HandleClassZeroInitialization(EvalInfo &Info, const Expr *E, bool RecordExprEvaluator::ZeroInitialization(const Expr *E) { const RecordDecl *RD = E->getType()->castAs()->getDecl(); + if (RD->isInvalidDecl()) return false; if (RD->isUnion()) { // C++11 [dcl.init]p5: If T is a (possibly cv-qualified) union type, the // object's first non-static named data member is zero-initialized @@ -3470,6 +3471,8 @@ bool RecordExprEvaluator::VisitInitListExpr(const InitListExpr *E) { return false; const RecordDecl *RD = E->getType()->castAs()->getDecl(); + if (RD->isInvalidDecl()) return false; + const ASTRecordLayout &Layout = Info.Ctx.getASTRecordLayout(RD); if (RD->isUnion()) { @@ -3528,6 +3531,8 @@ bool RecordExprEvaluator::VisitInitListExpr(const InitListExpr *E) { bool RecordExprEvaluator::VisitCXXConstructExpr(const CXXConstructExpr *E) { const CXXConstructorDecl *FD = E->getConstructor(); + if (FD->isInvalidDecl() || FD->getParent()->isInvalidDecl()) return false; + bool ZeroInit = E->requiresZeroInitialization(); if (CheckTrivialDefaultConstructor(Info, E->getExprLoc(), FD, ZeroInit)) { // If we've already performed zero-initialization, we're already done. diff --git a/test/SemaCXX/constant-expression.cpp b/test/SemaCXX/constant-expression.cpp index 23a4dda708..c997f3c525 100644 --- a/test/SemaCXX/constant-expression.cpp +++ b/test/SemaCXX/constant-expression.cpp @@ -117,3 +117,10 @@ namespace FloatConvert { typedef int a[(int)42.997]; typedef int b[(int)4e10]; // expected-warning {{variable length}} expected-error {{variable length}} } + +// PR12626 +namespace test3 { + struct X; // expected-note {{forward declaration of 'test3::X'}} + struct Y { bool b; X x; }; // expected-error {{field has incomplete type 'test3::X'}} + int f() { return Y().b; } +} -- 2.40.0