Patchwork C++ PATCH for c++/57402 (ICE with VLA initialization)

login
register
mail settings
Submitter Jason Merrill
Date July 13, 2013, 11:07 p.m.
Message ID <51E1DDBF.2090705@redhat.com>
Download mbox | patch
Permalink /patch/258871/
State New
Headers show

Comments

Jason Merrill - July 13, 2013, 11:07 p.m.
Value-initialization isn't quite right, either; we need to use {} to 
initialize elements without an explicit initializer.

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

Patch

commit f1f87745de6be6cf23acfb6aa30f44cce9cbcff6
Author: Jason Merrill <jason@redhat.com>
Date:   Fri Jul 12 16:58:58 2013 -0700

    	PR c++/57402
    	* init.c (build_vec_init): Use {} for arrays of class type.
    	(build_vec_delete): Don't take the address of the array.

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 7acc7b5..808803d 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -3561,10 +3561,14 @@  build_vec_init (tree base, tree maxindex, tree init,
 	    vec_free (new_vec);
 	}
 
-      /* Clear out INIT so that we don't get confused below.  */
-      init = NULL_TREE;
       /* Any elements without explicit initializers get {}.  */
-      explicit_value_init_p = true;
+      if (cxx_dialect >= cxx11 && AGGREGATE_TYPE_P (type))
+	init = build_constructor (init_list_type_node, NULL);
+      else
+	{
+	  init = NULL_TREE;
+	  explicit_value_init_p = true;
+	}
     }
   else if (from_array)
     {
@@ -3636,11 +3640,11 @@  build_vec_init (tree base, tree maxindex, tree init,
 	}
       else if (TREE_CODE (type) == ARRAY_TYPE)
 	{
-	  if (init != 0)
+	  if (init && !BRACE_ENCLOSED_INITIALIZER_P (init))
 	    sorry
 	      ("cannot initialize multi-dimensional array with initializer");
 	  elt_init = build_vec_init (build1 (INDIRECT_REF, type, base),
-				     0, 0,
+				     0, init,
 				     explicit_value_init_p,
 				     0, complain);
 	}
@@ -4121,7 +4125,7 @@  build_vec_delete (tree base, tree maxindex,
 	 bad name.  */
       maxindex = array_type_nelts_total (type);
       type = strip_array_types (type);
-      base = cp_build_addr_expr (base, complain);
+      base = decay_conversion (base, complain);
       if (base == error_mark_node)
 	return error_mark_node;
       if (TREE_SIDE_EFFECTS (base))
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted45.C b/gcc/testsuite/g++.dg/cpp0x/defaulted45.C
new file mode 100644
index 0000000..e91b3a1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted45.C
@@ -0,0 +1,20 @@ 
+// { dg-do run }
+// { dg-require-effective-target c++11 }
+
+struct A
+{
+  int i;
+  A() = default;
+  A(int i): i{i} { }
+  ~A() {}
+};
+
+int main(int argc, char **argv)
+{
+  { int i[4] = { 42, 42, 42, 42 }; }
+  {
+    A a[4] = { argc };
+    if (a[1].i != 0)
+      __builtin_abort ();
+  }
+}
diff --git a/gcc/testsuite/g++.dg/cpp1y/vla-initlist1.C b/gcc/testsuite/g++.dg/cpp1y/vla-initlist1.C
new file mode 100644
index 0000000..1e93835
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/vla-initlist1.C
@@ -0,0 +1,23 @@ 
+// { dg-do run }
+// { dg-options "-std=c++1y" }
+
+#include <initializer_list>
+
+struct A
+{
+  int i;
+  A(std::initializer_list<int>) { }
+  A(int i): i{i} { }
+  ~A() {}
+};
+
+int x = 4;
+int main(int argc, char **argv)
+{
+  { int i[x] = { 42, 42, 42, 42 }; }
+  {
+    A a[x] = { argc };
+    if (a[1].i != 42)
+      __builtin_abort ();
+  }
+}