From: Jason Merrill <jason@redhat.com>
Date: Fri, 16 Mar 2018 14:35:47 +0000 (-0400)
Subject: PR c++/83937 - wrong C++17 handling of init-list ctor argument.
X-Git-Tag: basepoints/gcc-9~644
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a81495699e206fef07824accd73d183294a1d0b0;p=thirdparty%2Fgcc.git

PR c++/83937 - wrong C++17 handling of init-list ctor argument.

	* call.c (build_special_member_call): Don't convert an init-list
	argument directly to the class type.

From-SVN: r258594
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0ea83713701f..7428c4bf20bc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-16  Jason Merrill  <jason@redhat.com>
+
+	PR c++/83937 - wrong C++17 handling of init-list ctor argument.
+	* call.c (build_special_member_call): Don't convert an init-list
+	argument directly to the class type.
+
 2018-03-16  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c++/79937
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 5cee63fed092..a32f41915fc0 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -8827,7 +8827,12 @@ build_special_member_call (tree instance, tree name, vec<tree, va_gc> **args,
 	/* If we're using this to initialize a non-temporary object, don't
 	   require the destructor to be accessible.  */
 	sub_complain |= tf_no_cleanup;
-      if (!reference_related_p (class_type, TREE_TYPE (arg)))
+      if (BRACE_ENCLOSED_INITIALIZER_P (arg)
+	  && !CONSTRUCTOR_IS_DIRECT_INIT (arg))
+	/* An init-list arg needs to convert to the parm type (83937), so fall
+	   through to normal processing.  */
+	arg = error_mark_node;
+      else if (!reference_related_p (class_type, TREE_TYPE (arg)))
 	arg = perform_implicit_conversion_flags (class_type, arg,
 						 sub_complain,
 						 flags);
diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist-ctor2.C b/gcc/testsuite/g++.dg/cpp0x/initlist-ctor2.C
new file mode 100644
index 000000000000..ebacec0cff5a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist-ctor2.C
@@ -0,0 +1,15 @@
+// PR c++/83937
+// { dg-do run { target c++11 } }
+
+struct S
+{
+  S(int v = 42) {
+    if (v != int{})
+      __builtin_abort();
+  }
+};
+
+int main()
+{
+  S( {} );
+}