constexpr: evaluate (bool)&x as true when x is a local variable or a temporary.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@149045 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index 1c0d9ea..6a292c3 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -950,10 +950,6 @@
return true;
}
- // Require the base expression to be a global l-value.
- // FIXME: C++11 requires such conversions. Remove this check.
- if (!IsGlobalLValue(Value.getLValueBase())) return false;
-
// We have a non-null base. These are generally known to be true, but if it's
// a weak declaration it can be null at runtime.
Result = true;
diff --git a/test/Sema/const-eval.c b/test/Sema/const-eval.c
index a40039b..22ac67a 100644
--- a/test/Sema/const-eval.c
+++ b/test/Sema/const-eval.c
@@ -24,7 +24,7 @@
void f()
{
int a;
- EVAL_EXPR(15, (_Bool)&a); // expected-error {{fields must have a constant size}}
+ EVAL_EXPR(15, (_Bool)&a);
}
// FIXME: Turn into EVAL_EXPR test once we have more folding.
diff --git a/test/SemaCXX/constant-expression-cxx11.cpp b/test/SemaCXX/constant-expression-cxx11.cpp
index af66acd..3c85adc 100644
--- a/test/SemaCXX/constant-expression-cxx11.cpp
+++ b/test/SemaCXX/constant-expression-cxx11.cpp
@@ -737,6 +737,9 @@
constexpr int n = f(T(5));
static_assert(f(T(5)) == 5, "");
+constexpr bool b(int n) { return &n; }
+static_assert(b(0), "");
+
}
namespace Union {
