From: Jason Merrill <jason@redhat.com>
Date: Fri, 13 Apr 2012 19:43:47 +0000 (-0400)
Subject: re PR c++/52905 ([C++0x] ice on invalid brace-enclosed initializer of vector of enums)
X-Git-Tag: misc/gccgo-go1_1_2~3504
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7aca561c8671a2ef8203c5571714b7886e2c8758;p=thirdparty%2Fgcc.git

re PR c++/52905 ([C++0x] ice on invalid brace-enclosed initializer of vector of enums)

	PR c++/52905
	* call.c (joust): Handle comparing list and non-list ctors.

From-SVN: r186433
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4bb79371109e..e8bcc377fc6c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-13  Jason Merrill  <jason@redhat.com>
 
+	PR c++/52905
+	* call.c (joust): Handle comparing list and non-list ctors.
+
 	PR c++/52915
 	* decl2.c (finish_anon_union): Use cp_finish_decl.
 	* error.c (dump_function_name): Avoid showing anonymous "name".
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 3c3dabb74a0a..46ac55c70fd8 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -8011,6 +8011,12 @@ joust (struct z_candidate *cand1, struct z_candidate *cand2, bool warn)
       int static_1 = DECL_STATIC_FUNCTION_P (cand1->fn);
       int static_2 = DECL_STATIC_FUNCTION_P (cand2->fn);
 
+      if (DECL_CONSTRUCTOR_P (cand1->fn)
+	  && is_list_ctor (cand1->fn) != is_list_ctor (cand2->fn))
+	/* We're comparing a near-match list constructor and a near-match
+	   non-list constructor.  Just treat them as unordered.  */
+	return 0;
+
       gcc_assert (static_1 != static_2);
 
       if (static_1)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 587e112626a5..e3ea64acfd27 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-13  Jason Merrill  <jason@redhat.com>
 
+	PR c++/52905
+	* g++.dg/cpp0x/initlist-ctor1.C: New.
+
 	PR c++/52915
 	* g++.dg/other/anon-union2.C: New.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-ctor1.C b/gcc/testsuite/g++.dg/cpp0x/initlist-ctor1.C
new file mode 100644
index 000000000000..82031cbcc84f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-ctor1.C
@@ -0,0 +1,13 @@
+// PR c++/52905
+// { dg-options -std=c++11 }
+
+#include <initializer_list>
+
+enum E { e1, e2 };
+struct A
+{
+  A(std::initializer_list<E>);	// { dg-message "A::A" }
+  A(int, E);			// { dg-message "A::A" }
+};
+
+A a{e1,2};			// { dg-error "" }