From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jason@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2122)
 id 1D172395441A; Tue,  8 Jun 2021 13:24:30 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D172395441A
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 r11-8524] c++: alias with same name as base fn [PR91706]
X-Act-Checkin: gcc
X-Git-Author: Jason Merrill <jason@redhat.com>
X-Git-Refname: refs/heads/releases/gcc-11
X-Git-Oldrev: 03346eb2ccd72fcc0ebe71a5b12e850078ec10ab
X-Git-Newrev: 46c1a9f6d03ab444b42c41067597e3fbfba38486
Message-Id: <20210608132430.1D172395441A@sourceware.org>
Date: Tue,  8 Jun 2021 13:24:30 +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: Tue, 08 Jun 2021 13:24:30 -0000

https://gcc.gnu.org/g:46c1a9f6d03ab444b42c41067597e3fbfba38486

commit r11-8524-g46c1a9f6d03ab444b42c41067597e3fbfba38486
Author: Jason Merrill <jason@redhat.com>
Date:   Fri Apr 16 11:13:40 2021 -0400

    c++: alias with same name as base fn [PR91706]
    
    This is a bit complex.  Looking up c<T> in the definition of D::c finds
    C::c, OK.  Looking up c in the definition of E finds D::c, OK.  Since the
    alias is not dependent, we strip it from the template argument, leaving
    
    using E = A<decltype(c<T>())>;
    
    where 'c' still refers to C::c.  But instantiating E looks up 'c' again and
    finds D::c, which isn't a function, and sadness ensues.
    
    I think the bug here is looking up 'c' in D at instantiation time; the
    declaration we found before is not dependent.  This seems to happen because
    baselink_for_fns gets BASELINK_BINFO wrong; it is supposed to be the base
    where lookup found the functions, C in this case.
    
    gcc/cp/ChangeLog:
    
            PR c++/91706
            * semantics.c (baselink_for_fns): Fix BASELINK_BINFO.
    
    gcc/testsuite/ChangeLog:
    
            PR c++/91706
            * g++.dg/template/lookup17.C: New test.

Diff:
---
 gcc/cp/semantics.c                       |  6 ++++--
 gcc/testsuite/g++.dg/template/lookup17.C | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 27a50d70899..e56f6a40ae1 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -3660,8 +3660,10 @@ baselink_for_fns (tree fns)
   cl = currently_open_derived_class (scope);
   if (!cl)
     cl = scope;
-  cl = TYPE_BINFO (cl);
-  return build_baselink (cl, cl, fns, /*optype=*/NULL_TREE);
+  tree access_path = TYPE_BINFO (cl);
+  tree conv_path = (cl == scope ? access_path
+		    : lookup_base (cl, scope, ba_any, NULL, tf_none));
+  return build_baselink (conv_path, access_path, fns, /*optype=*/NULL_TREE);
 }
 
 /* Returns true iff DECL is a variable from a function outside
diff --git a/gcc/testsuite/g++.dg/template/lookup17.C b/gcc/testsuite/g++.dg/template/lookup17.C
new file mode 100644
index 00000000000..b8571b9f1eb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/lookup17.C
@@ -0,0 +1,18 @@
+// PR c++/91706
+// { dg-do compile { target c++11 } }
+// { dg-additional-options -g }
+
+template <bool> struct A;
+
+struct B { static constexpr bool g = false; };
+
+struct C {
+  template <typename> static B c ();
+};
+
+template <class T> struct D : C {
+  using c = decltype (c<T>());
+  using E = A<c::g>;
+};
+
+D<int> g;