From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jason@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2122)
 id 969D7398545B; Fri, 13 May 2022 20:10:13 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 969D7398545B
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Jason Merrill <jason@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r9-10180] c++: static memfn from non-dependent base [PR101078]
X-Act-Checkin: gcc
X-Git-Author: Jason Merrill <jason@redhat.com>
X-Git-Refname: refs/heads/releases/gcc-9
X-Git-Oldrev: 950a97a5039c7b96602edfdf8984b5800f5837f3
X-Git-Newrev: 5b98dd6703aa1c4aa54de7b6079fd3dc39f7e66d
Message-Id: <20220513201013.969D7398545B@sourceware.org>
Date: Fri, 13 May 2022 20:10:13 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 13 May 2022 20:10:13 -0000

https://gcc.gnu.org/g:5b98dd6703aa1c4aa54de7b6079fd3dc39f7e66d

commit r9-10180-g5b98dd6703aa1c4aa54de7b6079fd3dc39f7e66d
Author: Jason Merrill <jason@redhat.com>
Date:   Wed Jun 16 16:09:59 2021 -0400

    c++: static memfn from non-dependent base [PR101078]
    
    After my patch for PR91706, or before that with the qualified call,
    tsubst_baselink returned a BASELINK with BASELINK_BINFO indicating a base of
    a still-dependent derived class.  We need to look up the relevant base binfo
    in the substituted class.
    
            PR c++/101078
    
    gcc/cp/ChangeLog:
    
            * pt.c (tsubst_baselink): Update binfos in non-dependent case.
    
    gcc/testsuite/ChangeLog:
    
            * g++.dg/template/access39.C: New test.

Diff:
---
 gcc/cp/pt.c                              | 15 +++++++++++++--
 gcc/testsuite/g++.dg/template/access39.C | 17 +++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index b8aa7f8cb6a..b4d522b3769 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -15460,8 +15460,19 @@ tsubst_baselink (tree baselink, tree object_type,
 	fns = BASELINK_FUNCTIONS (baselink);
     }
   else
-    /* We're going to overwrite pieces below, make a duplicate.  */
-    baselink = copy_node (baselink);
+    {
+      /* We're going to overwrite pieces below, make a duplicate.  */
+      baselink = copy_node (baselink);
+
+      if (qualifying_scope != BINFO_TYPE (BASELINK_ACCESS_BINFO (baselink)))
+	{
+	  /* The decl we found was from non-dependent scope, but we still need
+	     to update the binfos for the instantiated qualifying_scope.  */
+	  BASELINK_ACCESS_BINFO (baselink) = TYPE_BINFO (qualifying_scope);
+	  BASELINK_BINFO (baselink) = lookup_base (qualifying_scope, binfo_type,
+						   ba_unique, NULL, complain);
+	}
+    }
 
   /* If lookup found a single function, mark it as used at this point.
      (If lookup found multiple functions the one selected later by
diff --git a/gcc/testsuite/g++.dg/template/access39.C b/gcc/testsuite/g++.dg/template/access39.C
new file mode 100644
index 00000000000..d941555577e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/access39.C
@@ -0,0 +1,17 @@
+// PR c++/101078
+
+struct A {
+  static void f();
+};
+
+template<class>
+struct B : private A {
+  struct C {
+    void g() { f(); }
+    void g2() { B::f(); }
+  };
+};
+
+int main() {
+  B<int>::C().g();
+}