diff options
| -rw-r--r-- | lib/AST/ExprConstant.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGen/init.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index bec3792000..5dae4d4475 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -2210,6 +2210,8 @@ bool Expr::Evaluate(EvalResult &Result, ASTContext &Ctx) const { } else if (E->getType()->isIntegerType()) { if (!IntExprEvaluator(Info, Info.EvalResult.Val).Visit(const_cast<Expr*>(E))) return false; + if (Result.Val.isLValue() && !IsGlobalLValue(Result.Val.getLValueBase())) + return false; } else if (E->getType()->hasPointerRepresentation()) { LValue LV; if (!EvaluatePointer(E, LV, Info)) diff --git a/test/CodeGen/init.c b/test/CodeGen/init.c index d48e723c58..c8de99d901 100644 --- a/test/CodeGen/init.c +++ b/test/CodeGen/init.c @@ -40,3 +40,9 @@ vec3 f5(vec3 value) { .x = value.x }}; } + +// rdar://problem/8154689 +void f6() { + int x; + long ids[] = { (long) &x }; +} |