From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 21 Dec 2015 03:04:08 +0000 (+0000)
Subject: 	PR c++/67411
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=354aade301ffad7ba39873ab2c2dba4eafd849bd;p=thirdparty%2Fgcc.git

	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 e7adad382282..1dd533efa79c 100644
--- 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 1e4282a80670..e9c9ffc85f22 100644
--- 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)