maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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.

llvm-svn: 301891
This commit is contained in:
Nick Lewycky 2017-05-02 01:06:16 +00:00
parent 899a75cefe
commit c190f96b7d
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/AST/ExprConstant.cpp
View File

@ -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;

8
clang/test/Sema/integer-overflow.c
View File

@ -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)));

4
clang/test/SemaCXX/constant-expression-cxx11.cpp
View File

@ -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 {};