From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 29 Mar 2012 14:14:00 +0000 (+0000)
Subject: 	PR c++/52743
X-Git-Tag: upstream/4.9.2~13519
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=31708e0a8be84f568f80d5c4168f1cf8b700f6b7;p=platform%2Fupstream%2Flinaro-gcc.git

	PR c++/52743
	* call.c (compare_ics): Handle ck_aggr like ck_list.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185963 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b8a6b5c..166f559 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-29  Jason Merrill  <jason@redhat.com>
+
+	PR c++/52743
+	* call.c (compare_ics): Handle ck_aggr like ck_list.
+
 2012-03-28  Jason Merrill  <jason@redhat.com>
 
 	PR c++/52746
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 88733f5..3c3dabb7 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -7620,7 +7620,7 @@ compare_ics (conversion *ics1, conversion *ics2)
      Specifically, we need to do the reference binding comparison at the
      end of this function.  */
 
-  if (ics1->user_conv_p || ics1->kind == ck_list)
+  if (ics1->user_conv_p || ics1->kind == ck_list || ics1->kind == ck_aggr)
     {
       conversion *t1;
       conversion *t2;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 954e8fb..dbb5cae 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-29  Jason Merrill  <jason@redhat.com>
+
+	PR c++/52743
+	* g++.dg/cpp0x/initlist-array3.C: New.
+
 2012-03-28  Jason Merrill  <jason@redhat.com>
 
 	PR c++/52746
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-array3.C b/gcc/testsuite/g++.dg/cpp0x/initlist-array3.C
new file mode 100644
index 0000000..1a94f4e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-array3.C
@@ -0,0 +1,10 @@
+// PR c++/52743
+// { dg-do compile { target c++11 } }
+
+void composite (int const (&) [2]);
+void composite (int const (&) [3]);
+
+int main ()
+{
+  composite({0,1});		// { dg-error "ambiguous" }
+}