diff mbox

C++ PATCH for c++/79401 (protected inherited constructor)

Message ID CADzB+2mTi-mvAE-w90scs-vSH-HWgHAKXYiAMLMPGWiS_EOkHQ@mail.gmail.com
State New
Headers show

Commit Message

Jason Merrill Feb. 10, 2017, 6 p.m. UTC 
For a protected ctor, we need to adjust the access path, not clobber it.

Tested x86_64-pc-linux-gnu, applying to trunk.
commit d065eb77265df02c1f77fc9ea78b09b731c9fa0c
Author: Jason Merrill <jason@redhat.com>
Date:   Fri Feb 10 12:15:42 2017 -0500

            PR c++/79401 - protected inherited constructor
    
            * call.c (enforce_access): For inheriting constructor, find a base
            binfo in the path we already have.
diff mbox

Patch

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 6533214..718438c 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 0000000..fcb6e84
--- /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)
+{
+}