diff options
| author | Jason Merrill <jason@redhat.com> | 2022-03-26 22:05:53 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2022-03-28 09:35:58 -0400 |
| commit | 8bc5cdaafa2e729f9209684dc30aa0acb72d2580 (patch) | |
| tree | 0204dfbc4f6db215d3b0c399df1e3e49e24bf35b /gcc/cp | |
| parent | 72bdfcb848327020f62f72405d72cf85650666e1 (diff) | |
| download | gcc-8bc5cdaafa2e729f9209684dc30aa0acb72d2580.zip gcc-8bc5cdaafa2e729f9209684dc30aa0acb72d2580.tar.gz gcc-8bc5cdaafa2e729f9209684dc30aa0acb72d2580.tar.bz2 | |
c++: CTAD and member function references [PR103943]
More quirks of rewriting member references to dependent references for
CTAD. A reference to a member of dependent scope is definitely dependent.
And since r11-7044, tsubst_baselink builds a SCOPE_REF, so
tsubst_qualified_id should just use it.
PR c++/103943
gcc/cp/ChangeLog:
* pt.cc (tsubst_qualified_id): Handle getting SCOPE_REF from
tsubst_baselink.
(instantiation_dependent_scope_ref_p): Check dependent_scope_p.
gcc/testsuite/ChangeLog:
* g++.dg/cpp1z/class-deduction109.C: New test.
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/pt.cc | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 173bc3a..b229c9f 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -16590,12 +16590,20 @@ tsubst_qualified_id (tree qualified_id, tree args, if (dependent_scope_p (scope)) { - if (is_template) - expr = build_min_nt_loc (loc, TEMPLATE_ID_EXPR, expr, template_args); - tree r = build_qualified_name (NULL_TREE, scope, expr, - QUALIFIED_NAME_IS_TEMPLATE (qualified_id)); - REF_PARENTHESIZED_P (r) = REF_PARENTHESIZED_P (qualified_id); - return r; + if (TREE_CODE (expr) == SCOPE_REF) + /* We built one in tsubst_baselink. */ + gcc_checking_assert (same_type_p (scope, TREE_OPERAND (expr, 0))); + else + { + if (is_template) + expr = build_min_nt_loc (loc, TEMPLATE_ID_EXPR, expr, + template_args); + expr = build_qualified_name (NULL_TREE, scope, expr, + QUALIFIED_NAME_IS_TEMPLATE + (qualified_id)); + } + REF_PARENTHESIZED_P (expr) = REF_PARENTHESIZED_P (qualified_id); + return expr; } if (!BASELINK_P (name) && !DECL_P (expr)) @@ -27334,6 +27342,7 @@ instantiation_dependent_scope_ref_p (tree t) { if (DECL_P (TREE_OPERAND (t, 1)) && CLASS_TYPE_P (TREE_OPERAND (t, 0)) + && !dependent_scope_p (TREE_OPERAND (t, 0)) && !unknown_base_ref_p (t) && accessible_in_template_p (TREE_OPERAND (t, 0), TREE_OPERAND (t, 1))) |