From c0b6f54bd34fc824b7dcacf2a57b0b915852389d Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Fri, 12 Dec 2014 12:52:28 -0500
Subject: [PATCH] pt.c (do_auto_deduction): In direct-init context, { x }
 deduces from x.

	N3922
	* pt.c (do_auto_deduction): In direct-init context, { x } deduces
	from x.

From-SVN: r218685
---
 gcc/cp/ChangeLog                            |  4 ++++
 gcc/cp/decl.c                               |  2 ++
 gcc/cp/pt.c                                 | 16 +++++++++++++++-
 gcc/testsuite/g++.dg/cpp0x/initlist-n3922.C | 15 +++++++++++++++
 gcc/testsuite/g++.dg/cpp1y/lambda-init5.C   |  2 +-
 5 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/initlist-n3922.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 828848164ed..4fb8a13c322 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2014-12-12  Jason Merrill  <jason@redhat.com>
 
+	N3922
+	* pt.c (do_auto_deduction): In direct-init context, { x } deduces
+	from x.
+
 	* cp-tree.h (NAMESPACE_ABI_TAG): New.
 	* name-lookup.c (handle_namespace_attrs): Set it.
 	* class.c (check_tag): Split out from find_abi_tags_r.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index efc20012831..5ed9b2c216a 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5546,6 +5546,8 @@ reshape_init_r (tree type, reshape_iter *d, bool first_initializer_p,
 	 of g++.old-deja/g++.mike/p7626.C: a pointer-to-member constant is
 	 a CONSTRUCTOR (with a record type).  */
       if (TREE_CODE (init) == CONSTRUCTOR
+	  /* Don't complain about a capture-init.  */
+	  && !CONSTRUCTOR_IS_DIRECT_INIT (init)
 	  && BRACE_ENCLOSED_INITIALIZER_P (init))  /* p7626.C */
 	{
 	  if (SCALAR_TYPE_P (type))
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index d8a9c5b1b32..8a663d98c47 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -22117,7 +22117,21 @@ do_auto_deduction (tree type, tree init, tree auto_node)
      initializer is a braced-init-list (8.5.4), with
      std::initializer_list<U>.  */
   if (BRACE_ENCLOSED_INITIALIZER_P (init))
-    type = listify_autos (type, auto_node);
+    {
+      if (!DIRECT_LIST_INIT_P (init))
+	type = listify_autos (type, auto_node);
+      else if (CONSTRUCTOR_NELTS (init) == 1)
+	init = CONSTRUCTOR_ELT (init, 0)->value;
+      else
+	{
+	  if (permerror (input_location, "direct-list-initialization of "
+			 "%<auto%> requires exactly one element"))
+	    inform (input_location,
+		    "for deduction to %<std::initializer_list%>, use copy-"
+		    "list-initialization (i.e. add %<=%> before the %<{%>)");
+	  type = listify_autos (type, auto_node);
+	}
+    }
 
   init = resolve_nondeduced_context (init);
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-n3922.C b/gcc/testsuite/g++.dg/cpp0x/initlist-n3922.C
new file mode 100644
index 00000000000..4dadfc986d3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-n3922.C
@@ -0,0 +1,15 @@
+// N3922
+// { dg-do compile { target c++11 } }
+
+#include <initializer_list>
+template <class T, class U> struct same_type;
+template <class T> struct same_type<T,T> {};
+
+auto x1 = { 1, 2 }; // decltype(x1) is std::initializer_list<int>
+same_type<decltype(x1),std::initializer_list<int>> s1;
+auto x4 = { 3 }; // decltype(x4) is std::initializer_list<int>
+same_type<decltype(x4),std::initializer_list<int>> s4;
+auto x5{ 3 }; // decltype(x5) is int
+same_type<decltype(x5),int> s5;
+auto x2 = { 1, 2.0 }; // { dg-error "initializer_list" } cannot deduce element type
+auto x3{ 1, 2 }; // { dg-error "one element" } not a single element
diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-init5.C b/gcc/testsuite/g++.dg/cpp1y/lambda-init5.C
index 5976de0f073..1b287a16888 100644
--- a/gcc/testsuite/g++.dg/cpp1y/lambda-init5.C
+++ b/gcc/testsuite/g++.dg/cpp1y/lambda-init5.C
@@ -6,5 +6,5 @@
 int main()
 {
   if ([x(42)]{ return x; }() != 42) __builtin_abort();
-  if ([x{1,2}]{ return x.begin()[0]; }() != 1) __builtin_abort();
+  if ([x{24}]{ return x; }() != 24) __builtin_abort();
 }
-- 
2.30.2