]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
re PR c++/60708 (An array temporary causes an ICE in gimplify)
authorJason Merrill <jason@redhat.com>
Tue, 1 Apr 2014 19:14:00 +0000 (15:14 -0400)
committerJason Merrill <jason@gcc.gnu.org>
Tue, 1 Apr 2014 19:14:00 +0000 (15:14 -0400)
PR c++/60708
* call.c (build_array_conv): Call complete_type.

From-SVN: r208996

gcc/cp/ChangeLog
gcc/cp/call.c
gcc/testsuite/g++.dg/cpp0x/initlist82.C [new file with mode: 0644]

index 453e2c58b5f7dda9c8bd2479d342a2d446dc0ac1..2e6fd96afd319b529e2801993a035a9007b4bf7e 100644 (file)
@@ -1,5 +1,8 @@
 2014-04-01  Jason Merrill  <jason@redhat.com>
 
+       PR c++/60708
+       * call.c (build_array_conv): Call complete_type.
+
        PR c++/60713
        * typeck2.c (PICFLAG_SIDE_EFFECTS): New.
        (picflag_from_initializer): Return it.
index 877f6d9cf1728ec41b7e1e4c4b986af772b88241..ae0d4fff974434cb26a13b33ca8013acd1596dc2 100644 (file)
@@ -948,6 +948,9 @@ build_array_conv (tree type, tree ctor, int flags, tsubst_flags_t complain)
   bool user = false;
   enum conversion_rank rank = cr_exact;
 
+  /* We might need to propagate the size from the element to the array.  */
+  complete_type (type);
+
   if (TYPE_DOMAIN (type)
       && !variably_modified_type_p (TYPE_DOMAIN (type), NULL_TREE))
     {
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist82.C b/gcc/testsuite/g++.dg/cpp0x/initlist82.C
new file mode 100644 (file)
index 0000000..3b9ccad
--- /dev/null
@@ -0,0 +1,20 @@
+// PR c++/60708
+// { dg-do compile { target c++11 } }
+
+template <class T, class U> struct mypair {
+  mypair(T, U) {}
+};
+
+template<typename T> struct S {
+ mypair<T *, int> get_pair() noexcept {
+   return mypair<T*,int>(nullptr, 0);
+ }
+};
+
+static void foo(const mypair<char *, int> (&a)[2]) noexcept { }
+
+int main()
+{
+  S<char> s;
+  foo({s.get_pair(), s.get_pair()});
+}