From 5ae2db8f76e75b5e20ddeff8d250c9ba8bb4e05b Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Tue, 2 May 2017 01:06:16 +0000 Subject: [PATCH] Revert r301785 (and r301787) because they caused PR32864. The fix is that ExprEvaluatorBase::VisitInitListExpr should handle transparent exprs instead of exprs with one element. Fixing that uncovers one testcase failure because the AST for "constexpr _Complex float test2 = {1};" is wrong (the _Complex prvalue should not be const-qualified), and a number of test failures in test/OpenMP where the captured stmt contains an InitListExpr that is in syntactic form. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@301891 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AST/ExprConstant.cpp | 8 +------- test/Sema/integer-overflow.c | 8 ++++---- test/SemaCXX/constant-expression-cxx11.cpp | 4 ---- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index 5e6a629c01..4d0805323e 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -2186,9 +2186,6 @@ static bool HandleLValueBase(EvalInfo &Info, const Expr *E, LValue &Obj, if (!Base->isVirtual()) return HandleLValueDirectBase(Info, E, Obj, DerivedDecl, BaseDecl); - if (!Obj.checkNullPointer(Info, E, CSK_Base)) - return false; - SubobjectDesignator &D = Obj.Designator; if (D.Invalid) return false; @@ -9946,11 +9943,8 @@ static bool EvaluateAsRValue(EvalInfo &Info, const Expr *E, APValue &Result) { if (E->getType().isNull()) return false; - if (!CheckLiteralType(Info, E)) { - if (Info.noteFailure()) - EvaluateIgnoredValue(Info, E); + if (!CheckLiteralType(Info, E)) return false; - } if (!::Evaluate(Result, Info, E)) return false; diff --git a/test/Sema/integer-overflow.c b/test/Sema/integer-overflow.c index b2b7903e51..62ee33e3d1 100644 --- a/test/Sema/integer-overflow.c +++ b/test/Sema/integer-overflow.c @@ -149,16 +149,16 @@ uint64_t check_integer_overflows(int i) { // expected-warning@+2 {{overflow in expression; result is 536870912 with type 'int'}} uint64_t *b; - (void)b[4608 * 1024 * 1024]; + uint64_t b2 = b[4608 * 1024 * 1024] + 1; // expected-warning@+1 2{{overflow in expression; result is 536870912 with type 'int'}} - (void)(i ? (4608 * 1024 * 1024) : (4608 * 1024 * 1024)); + int j1 = i ? (4608 * 1024 * 1024) : (4608 * 1024 * 1024); // expected-warning@+1 {{overflow in expression; result is 536870912 with type 'int'}} - (void)(-(4608 * 1024 * 1024)); + int j2 = -(4608 * 1024 * 1024); // expected-warning@+1 {{overflow in expression; result is 536870912 with type 'int'}} - (void)b[4608 * 1024 * 1024]; + uint64_t j3 = b[4608 * 1024 * 1024]; // expected-warning@+1 2{{overflow in expression; result is 536870912 with type 'int'}} return ((4608 * 1024 * 1024) + ((uint64_t)(4608 * 1024 * 1024))); diff --git a/test/SemaCXX/constant-expression-cxx11.cpp b/test/SemaCXX/constant-expression-cxx11.cpp index 2a5e80adf8..4abbc8e928 100644 --- a/test/SemaCXX/constant-expression-cxx11.cpp +++ b/test/SemaCXX/constant-expression-cxx11.cpp @@ -60,10 +60,6 @@ namespace DerivedToVBaseCast { static_assert((U*)&d == w, ""); static_assert((U*)&d == x, ""); - // expected-error@+2 {{constexpr variable 'a' must be initialized by a constant expression}} - // expected-warning@+1 {{binding dereferenced null pointer to reference has undefined behavior}} - constexpr A &a = *((B*)0); // expected-note {{cannot access base class of null pointer}} - struct X {}; struct Y1 : virtual X {}; struct Y2 : X {}; -- 2.50.1