From: Jason Merrill <jason@redhat.com>
Date: Thu, 5 Apr 2018 16:42:09 +0000 (-0400)
Subject: PR c++/82152 - ICE with class deduction and inherited ctor.
X-Git-Tag: basepoints/gcc-9~303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be9d76c5bf7e256dbacd34d166079b75103882ba;p=thirdparty%2Fgcc.git

PR c++/82152 - ICE with class deduction and inherited ctor.

	* pt.c (do_class_deduction): Ignore inherited ctors.

From-SVN: r259133
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b453577fa14b..a876dc9bffdf 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2018-04-05  Jason Merrill  <jason@redhat.com>
 
+	PR c++/82152 - ICE with class deduction and inherited ctor.
+	* pt.c (do_class_deduction): Ignore inherited ctors.
+
 	PR c++/84665 - ICE with array of empty class.
 	* decl2.c (cp_check_const_attributes): Use fold_non_dependent_expr.
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index dc74635876e2..dc2310aefa85 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -26217,6 +26217,10 @@ do_class_deduction (tree ptype, tree tmpl, tree init, int flags,
   // FIXME cache artificial deduction guides
   for (ovl_iterator iter (CLASSTYPE_CONSTRUCTORS (type)); iter; ++iter)
     {
+      /* Skip inherited constructors.  */
+      if (iter.using_p ())
+	continue;
+
       tree guide = build_deduction_guide (*iter, outer_args, complain);
       if (guide == error_mark_node)
 	return error_mark_node;
diff --git a/gcc/testsuite/g++.dg/cpp1z/class-deduction54.C b/gcc/testsuite/g++.dg/cpp1z/class-deduction54.C
new file mode 100644
index 000000000000..e51398bbbb0a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/class-deduction54.C
@@ -0,0 +1,15 @@
+// PR c++/82152
+// { dg-additional-options -std=c++17 }
+
+struct Base {};
+
+template<typename T>
+struct Derived : public Base {
+  using Base::Base;
+};
+
+Derived() -> Derived< void >;
+
+int main() {
+  Derived x;
+}