* decl.c (duplicate_decls): Always merge DECL_DECLARED_CONSTEXPR_P.

From-SVN: r274932

gcc/cp/ChangeLog

+2019-08-26  Jason Merrill  <jason@redhat.com>
+
+	* decl.c (duplicate_decls): Always merge DECL_DECLARED_CONSTEXPR_P.
+
 2019-08-26  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/91545 - ICE in constexpr store evaluation.

gcc/cp/decl.c

@@ -2204,9 +2204,8 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend)
 	    SET_DECL_DEPENDENT_INIT_P (newdecl, true);
 	  DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (newdecl)
 	    |= DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (olddecl);
-          if (DECL_CLASS_SCOPE_P (olddecl))
-            DECL_DECLARED_CONSTEXPR_P (newdecl)
-	      |= DECL_DECLARED_CONSTEXPR_P (olddecl);
+	  DECL_DECLARED_CONSTEXPR_P (newdecl)
+	    |= DECL_DECLARED_CONSTEXPR_P (olddecl);
 
 	  /* Merge the threadprivate attribute from OLDDECL into NEWDECL.  */
 	  if (DECL_LANG_SPECIFIC (olddecl)

gcc/testsuite/g++.dg/cpp0x/constexpr-redeclaration2.C

+// { dg-do compile { target c++11 } }
+
+constexpr float pi = 3.14;
+extern const float pi;
+constexpr float x = pi;