From: Nathan Sidwell <nathan@acm.org>
Date: Wed, 18 Jan 2017 19:27:52 +0000 (+0000)
Subject: re PR c++/78488 (P0136R1 ICE when building call to inherited default constructor.)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c484627cf619d93610d2c9dca6950c9e70a65cf3;p=gcc.git

re PR c++/78488 (P0136R1 ICE when building call to inherited default constructor.)

	PR c++/78488
	* call.c (build_over_call): When checking ellipsis conversions for
	an inherited ctor, make sure there is at least one conversion.

	* g++.dg/cpp1z/inh-ctor37.C: New.

From-SVN: r244592
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 868475521d5..11dfbad2430 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-18  Nathan Sidwell  <nathan@acm.org>
+
+	PR c++/78488
+	* call.c (build_over_call): When checking ellipsis conversions for
+	an inherited ctor, make sure there is at least one conversion.
+
 2017-01-18  Jason Merrill  <jason@redhat.com>
 
 	PR c++/78894 - ICE with class deduction and default arg
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index e431221c159..88d83dd8a5d 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -7899,6 +7899,7 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain)
 	 could handle this by open-coding the inherited constructor rather than
 	 defining it, but let's not bother now.  */
       if (!cp_unevaluated_operand
+	  && cand->num_convs
 	  && cand->convs[cand->num_convs-1]->ellipsis_p)
 	{
 	  if (complain & tf_error)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 538e08effe2..e142e3eb557 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-18  Nathan Sidwell  <nathan@acm.org>
+
+	PR c++/78488
+	* g++.dg/cpp1z/inh-ctor37.C: New.
+
 2017-01-18  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR rtl-optimization/78952
diff --git a/gcc/testsuite/g++.dg/cpp1z/inh-ctor37.C b/gcc/testsuite/g++.dg/cpp1z/inh-ctor37.C
new file mode 100644
index 00000000000..d501c5b97c1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1z/inh-ctor37.C
@@ -0,0 +1,13 @@
+// { dg-do compile { target c++11 } }
+// PR 78488, seg fault with inherited ctor
+
+struct Foo { Foo() {} };
+
+struct Bar : Foo {
+  using Foo::Foo;
+  Bar(void*);
+};
+
+int main() {
+ Bar f;
+}