From 843633f841be49bf6d15a2f6208ce384870f37b8 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Fri, 21 Feb 2014 09:56:53 -0500
Subject: [PATCH] re PR c++/60224 (ICE using invalid initializer for array)

	PR c++/60224
	* decl.c (cp_complete_array_type, maybe_deduce_size_from_array_init):
	Don't get confused by a CONSTRUCTOR that already has a type.

From-SVN: r208002
---
 gcc/cp/ChangeLog                    | 4 ++++
 gcc/cp/decl.c                       | 7 ++++++-
 gcc/testsuite/g++.dg/init/array36.C | 8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/init/array36.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 61f585992221..62aacd62e81b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2014-02-21  Jason Merrill  <jason@redhat.com>
 
+	PR c++/60224
+	* decl.c (cp_complete_array_type, maybe_deduce_size_from_array_init):
+	Don't get confused by a CONSTRUCTOR that already has a type.
+
 	PR c++/60277
 	* call.c (build_array_conv): Don't crash on VLA.
 
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b7d2d9f502de..04c4cf515c33 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4880,7 +4880,7 @@ maybe_deduce_size_from_array_init (tree decl, tree init)
 	 those are not supported in GNU C++, and as the middle-end
 	 will crash if presented with a non-numeric designated
 	 initializer.  */
-      if (initializer && TREE_CODE (initializer) == CONSTRUCTOR)
+      if (initializer && BRACE_ENCLOSED_INITIALIZER_P (initializer))
 	{
 	  vec<constructor_elt, va_gc> *v = CONSTRUCTOR_ELTS (initializer);
 	  constructor_elt *ce;
@@ -7099,6 +7099,11 @@ cp_complete_array_type (tree *ptype, tree initial_value, bool do_default)
   int failure;
   tree type, elt_type;
 
+  /* Don't get confused by a CONSTRUCTOR for some other type.  */
+  if (initial_value && TREE_CODE (initial_value) == CONSTRUCTOR
+      && !BRACE_ENCLOSED_INITIALIZER_P (initial_value))
+    return 1;
+
   if (initial_value)
     {
       unsigned HOST_WIDE_INT i;
diff --git a/gcc/testsuite/g++.dg/init/array36.C b/gcc/testsuite/g++.dg/init/array36.C
new file mode 100644
index 000000000000..77e4f909146a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/init/array36.C
@@ -0,0 +1,8 @@
+// PR c++/60224
+
+struct A {};
+
+void foo()
+{
+  bool b[] = (int (A::*)())0;	// { dg-error "" }
+}
-- 
2.47.2