From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 222243864C65; Wed, 23 Mar 2022 12:56:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 222243864C65 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-7784] c++: using from enclosing class template [PR105006] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/master X-Git-Oldrev: e6a3991ea15c0b14117b5693d77e15fd0477ce51 X-Git-Newrev: a3f78748fab6b24e3d4a8b319afd3f8afa17248f Message-Id: <20220323125633.222243864C65@sourceware.org> Date: Wed, 23 Mar 2022 12:56:33 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2022 12:56:33 -0000 https://gcc.gnu.org/g:a3f78748fab6b24e3d4a8b319afd3f8afa17248f commit r12-7784-ga3f78748fab6b24e3d4a8b319afd3f8afa17248f Author: Jason Merrill Date: Tue Mar 22 11:17:26 2022 -0400 c++: using from enclosing class template [PR105006] Here, DECL_DEPENDENT_P was false for the second using because Row is "the current instantiation", so lookup succeeds. But since Row itself has a dependent using-decl for operator(), the set of functions imported by the second using is dependent, so we should set the flag. PR c++/105006 gcc/cp/ChangeLog: * name-lookup.cc (lookup_using_decl): Set DECL_DEPENDENT_P if lookup finds a dependent using. gcc/testsuite/ChangeLog: * g++.dg/template/using30.C: New test. Diff: --- gcc/cp/name-lookup.cc | 15 +++++++++++++++ gcc/testsuite/g++.dg/template/using30.C | 13 +++++++++++++ 2 files changed, 28 insertions(+) diff --git a/gcc/cp/name-lookup.cc b/gcc/cp/name-lookup.cc index 323f96bcd24..ea947fabb7e 100644 --- a/gcc/cp/name-lookup.cc +++ b/gcc/cp/name-lookup.cc @@ -5665,6 +5665,21 @@ lookup_using_decl (tree scope, name_lookup &lookup) lookup.value = lookup_member (binfo, lookup.name, /*protect=*/2, /*want_type=*/false, tf_none); + /* If the lookup in the base contains a dependent using, this + using is also dependent. */ + if (!dependent_p && lookup.value) + { + tree val = lookup.value; + if (tree fns = maybe_get_fns (val)) + val = fns; + for (tree f: lkp_range (val)) + if (TREE_CODE (f) == USING_DECL && DECL_DEPENDENT_P (f)) + { + dependent_p = true; + break; + } + } + if (!depscope && b_kind < bk_proper_base) { if (cxx_dialect >= cxx20 && lookup.value diff --git a/gcc/testsuite/g++.dg/template/using30.C b/gcc/testsuite/g++.dg/template/using30.C new file mode 100644 index 00000000000..914252dd14c --- /dev/null +++ b/gcc/testsuite/g++.dg/template/using30.C @@ -0,0 +1,13 @@ +// PR c++/105006 + +template +class Row { + using eT::operator(); + void operator()(); + class fixed; +}; + +template +class Row::fixed : Row { + using Row::operator(); +};