re PR c++/44358 ([C++0x] initializer list can't convert to map)

	PR c++/44358
	* call.c (build_list_conv): Set list-initialization flags properly.

From-SVN: r160131

gcc/cp/ChangeLog

+2010-06-01  Jason Merrill  <jason@redhat.com>
+
+	PR c++/44358
+	* call.c (build_list_conv): Set list-initialization flags properly.
+
 2010-06-01  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* typeck2.c (build_x_arrow): Make types_memoized a VEC.

gcc/cp/call.c

@@ -589,6 +589,12 @@ build_list_conv (tree type, tree ctor, int flags)
   unsigned i;
   tree val;
 
+  /* Within a list-initialization we can have more user-defined
+     conversions.  */
+  flags &= ~LOOKUP_NO_CONVERSION;
+  /* But no narrowing conversions.  */
+  flags |= LOOKUP_NO_NARROWING;
+
   FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (ctor), i, val)
     {
       conversion *sub

gcc/testsuite/ChangeLog

+2010-06-01  Jason Merrill  <jason@redhat.com>
+
+	PR c++/44358
+	* g++.dg/cpp0x/initlist36.C: New.
+
 2010-05-31 Jan Hubicka  <jh@suse.cz>
 
 	* testsuite/gcc.dg/noreturn-8.c: New testcase.

gcc/testsuite/g++.dg/cpp0x/initlist36.C

+// PR c++/44358
+// { dg-options "-std=c++0x" }
+
+#include <initializer_list>
+
+struct A
+{
+  A(int);
+};
+
+struct B
+{
+  B(std::initializer_list<A>);
+};
+
+void f (B b);
+int main()
+{
+  B b0 = {{1}};
+  B b1 = {{1.0}};		// { dg-error "narrowing" }
+}