diff options
author | Jason Merrill <jason@redhat.com> | 2022-03-22 11:17:26 -0400 |
---|---|---|
committer | Jason Merrill <jason@redhat.com> | 2022-03-23 08:56:17 -0400 |
commit | a3f78748fab6b24e3d4a8b319afd3f8afa17248f (patch) | |
tree | ff898410e9c665018f3a72d9d33ae22395769fbf /gcc | |
parent | e6a3991ea15c0b14117b5693d77e15fd0477ce51 (diff) |
c++: using from enclosing class template [PR105006]
Here, DECL_DEPENDENT_P was false for the second using because Row<eT> 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.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/name-lookup.cc | 15 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/template/using30.C | 13 |
2 files changed, 28 insertions, 0 deletions
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 eT> +class Row { + using eT::operator(); + void operator()(); + class fixed; +}; + +template<class eT> +class Row<eT>::fixed : Row { + using Row::operator(); +}; |