From: Jason Merrill <jason@redhat.com>
Date: Fri, 10 Feb 2017 18:01:27 +0000 (-0500)
Subject: PR c++/79401 - protected inherited constructor
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c16b872c8f1e32c11bb87346835e23125fce3747;p=gcc.git

PR c++/79401 - protected inherited constructor

	* call.c (enforce_access): For inheriting constructor, find a base
	binfo in the path we already have.

From-SVN: r245339
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5ea0c930a09..688a3bce86e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2017-02-10  Jason Merrill  <jason@redhat.com>
+
+	PR c++/79401 - protected inherited constructor
+	* call.c (enforce_access): For inheriting constructor, find a base
+	binfo in the path we already have.
+
 2017-02-10  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/79435
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 6533214799d..718438cff1b 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -6420,7 +6420,8 @@ enforce_access (tree basetype_path, tree decl, tree diag_decl,
 	 accessible when used to construct an object of the corresponding base
 	 class.  */
       decl = strip_inheriting_ctors (decl);
-      basetype_path = TYPE_BINFO (DECL_CONTEXT (decl));
+      basetype_path = lookup_base (basetype_path, DECL_CONTEXT (decl),
+				   ba_any, NULL, complain);
     }
 
   if (!accessible_p (basetype_path, decl, true))
diff --git a/gcc/testsuite/g++.dg/cpp0x/inh-ctor25.C b/gcc/testsuite/g++.dg/cpp0x/inh-ctor25.C
new file mode 100644
index 00000000000..fcb6e84ae4b
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/inh-ctor25.C
@@ -0,0 +1,20 @@
+// PR c++/79401
+// { dg-do compile { target c++11 } }
+
+class B
+{
+protected:
+  B (int, int);
+};
+class C : public B
+{
+protected:
+  using B::B;
+};
+class A : public C
+{
+  A (char *);
+};
+A::A (char *) : C (0, 0)
+{
+}