From: Jason Merrill <jason@redhat.com>
Date: Fri, 21 Feb 2014 21:49:05 +0000 (-0500)
Subject: re PR c++/60186 ([c++11] ICE with invalid value in constexpr array initializer)
X-Git-Tag: releases/gcc-4.9.0~760
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b98fb3633ea72bc48ce36975aa0ac2252f279a32;p=thirdparty%2Fgcc.git

re PR c++/60186 ([c++11] ICE with invalid value in constexpr array initializer)

	PR c++/60186
	* typeck2.c (massage_init_elt): Call fold_non_dependent_expr_sfinae.

From-SVN: r208027
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 14d499585d13..8e4a2a0d9d1e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2014-02-21  Jason Merrill  <jason@redhat.com>
 
+	PR c++/60186
+	* typeck2.c (massage_init_elt): Call fold_non_dependent_expr_sfinae.
+
 	PR c++/60187
 	* parser.c (cp_parser_enum_specifier): Call
 	check_for_bare_parameter_packs.
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 546b83fed720..8877286546e6 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1131,7 +1131,10 @@ massage_init_elt (tree type, tree init, tsubst_flags_t complain)
     init = TARGET_EXPR_INITIAL (init);
   /* When we defer constant folding within a statement, we may want to
      defer this folding as well.  */
-  init = maybe_constant_init (init);
+  tree t = fold_non_dependent_expr_sfinae (init, complain);
+  t = maybe_constant_value (t);
+  if (TREE_CONSTANT (t))
+    init = t;
   return init;
 }
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist7.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist7.C
new file mode 100644
index 000000000000..6fea82f515c6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-initlist7.C
@@ -0,0 +1,7 @@
+// PR c++/60186
+// { dg-require-effective-target c++11 }
+
+template<typename> void foo(int i)
+{
+  constexpr int a[] = { i };	// { dg-error "" }
+}