From 2a2ef01053f377c750d4dce0f10a317455b7d0d1 Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 19 Dec 2011 20:10:37 +0000
Subject: [PATCH] 	PR c++/51553 	* call.c (add_function_candidate):
 Allow conversions for the copy 	parm in list-initialization unless the
 argument is an init-list.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182495 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                        |  6 ++++++
 gcc/cp/call.c                           |  6 ++++--
 gcc/testsuite/ChangeLog                 |  3 +++
 gcc/testsuite/g++.dg/cpp0x/initlist64.C | 29 +++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist64.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d9e1949..e440087 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-19  Jason Merrill  <jason@redhat.com>
+
+	PR c++/51553
+	* call.c (add_function_candidate): Allow conversions for the copy
+	parm in list-initialization unless the argument is an init-list.
+
 2011-12-19  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/51619
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index dd716a4..3e6db51 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -1964,8 +1964,10 @@ add_function_candidate (struct z_candidate **candidates,
 	    {
 	      lflags |= LOOKUP_COPY_PARM;
 	      /* We allow user-defined conversions within init-lists, but
-		 not for the copy constructor.  */
-	      if (flags & LOOKUP_NO_COPY_CTOR_CONVERSION)
+		 don't list-initialize the copy parm, as that would mean
+		 using two levels of braces for the same type.  */
+	      if ((flags & LOOKUP_NO_COPY_CTOR_CONVERSION)
+		  && BRACE_ENCLOSED_INITIALIZER_P (arg))
 		lflags |= LOOKUP_NO_CONVERSION;
 	    }
 	  else
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 70c3315..d08c3ad 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2011-12-19  Jason Merrill  <jason@redhat.com>
 
+	PR c++/51553
+	* g++.dg/cpp0x/initlist64.C: New.
+
 	PR c++/51228
 	* c-c++-common/transparent-union-1.c: New.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist64.C b/gcc/testsuite/g++.dg/cpp0x/initlist64.C
new file mode 100644
index 0000000..337e89b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist64.C
@@ -0,0 +1,29 @@
+// PR c++/51553
+// { dg-options -std=c++0x }
+
+struct X
+{
+  X();
+};
+
+struct Y
+{
+  operator X() const;
+};
+
+struct Z
+{
+  explicit operator X() const;
+};
+
+X a = { Y() };
+X aa = Y();
+
+X b{ Y() };
+X bb(Y());
+
+X c = { Z() };  // { dg-error "" "" { xfail *-*-* } }
+X cc = Z();	// { dg-error "" }
+
+X d{ Z() };
+X dd( Z() );
-- 
2.7.4