diff mbox

C++ PATCH for c++/60224 (ICE initializing array with PMF)

Message ID 53075F25.2070006@redhat.com
State New
Headers show

Commit Message

Jason Merrill Feb. 21, 2014, 2:13 p.m. UTC 
We shouldn't treat a CONSTRUCTOR as an init-list if it already has a type.

Tested x86_64-pc-linux-gnu, applying to trunk.
diff mbox

Patch

commit 8e1493a7a31ffdb1e70977c325e7d2f2686b14a7
Author: Jason Merrill <jason@redhat.com>
Date:   Fri Feb 21 00:52:20 2014 -0500

    	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.

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b7d2d9f..04c4cf5 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 0000000..77e4f90
--- /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 "" }
+}