OSDN Git Service

PR c++/53500
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 31 May 2012 14:28:41 +0000 (14:28 +0000)
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 31 May 2012 14:28:41 +0000 (14:28 +0000)
PR c++/52905
* call.c (joust): Handle comparing list and non-list ctors.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@188063 138bc75d-0d04-0410-961f-82ee72b054a4

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

index 584f794..10ada12 100644 (file)
@@ -1,3 +1,9 @@
+2012-05-31  Jason Merrill  <jason@redhat.com>
+
+       PR c++/53500
+       PR c++/52905
+       * call.c (joust): Handle comparing list and non-list ctors.
+
 2012-05-30  Jason Merrill  <jason@redhat.com>
 
        PR c++/53356
index 59e6e49..2499ad1 100644 (file)
@@ -8015,6 +8015,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)
index 9a3a04a..f0d3875 100644 (file)
@@ -1,3 +1,8 @@
+2012-05-31  Jason Merrill  <jason@redhat.com>
+
+       PR c++/52905
+       * g++.dg/cpp0x/initlist-ctor1.C: New.
+
 2012-05-31  Richard Guenther  <rguenther@suse.de>
 
        PR middle-end/48493
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-ctor1.C b/gcc/testsuite/g++.dg/cpp0x/initlist-ctor1.C
new file mode 100644 (file)
index 0000000..82031cb
--- /dev/null
@@ -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 "" }