PR c++/67411

	* decl2.c (decl_maybe_constant_var_p): Use DECL_HAS_VALUE_EXPR_P.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231869 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e7adad382282b12d6752bef32d03e677b1371529..1dd533efa79cb503134a7a2dcf983e18586edce8 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2015-12-20  Jason Merrill  <jason@redhat.com>
 
+       PR c++/67411
+       * decl2.c (decl_maybe_constant_var_p): Use DECL_HAS_VALUE_EXPR_P.
+
        PR c++/67411
        * lambda.c (generic_lambda_fn_p): Split out from...
        (maybe_add_lambda_conv_op): ...here.

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 1e4282a806701937f2d5c1b3ec91c1186918e1c1..e9c9ffc85f220d48b7061fb8e5cbe0db3ba94d66 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -4222,7 +4222,7 @@ decl_maybe_constant_var_p (tree decl)
     return false;
   if (DECL_DECLARED_CONSTEXPR_P (decl))
     return true;
-  if (DECL_VALUE_EXPR (decl))
+  if (DECL_HAS_VALUE_EXPR_P (decl))
     /* A proxy isn't constant.  */
     return false;
   return (CP_TYPE_CONST_NON_VOLATILE_P (type)