[pushed] c++: template-id with current inst qualifier [PR102300]
Commit Message
The patch for PR41723 properly changed one place to look into the current
instantiation; now we need to fix this place as well.
Tested x86_64-pc-linux-gnu, applying to trunk.
PR c++/102300
gcc/cp/ChangeLog:
* parser.cc (cp_parser_template_name): Use dependent_scope_p.
gcc/testsuite/ChangeLog:
* g++.dg/template/nested7.C: New test.
---
gcc/cp/parser.cc | 8 ++++----
gcc/testsuite/g++.dg/parse/no-typename1.C | 2 +-
gcc/testsuite/g++.dg/template/nested7.C | 12 ++++++++++++
3 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/template/nested7.C
base-commit: 64655e7bdbea6b922f1f759eb9f1730b5e57029f
@@ -18574,7 +18574,7 @@ cp_parser_template_name (cp_parser* parser,
: parser->context->object_type);
if (scope && TYPE_P (scope)
&& (!CLASS_TYPE_P (scope)
- || (check_dependency_p && dependent_type_p (scope))))
+ || (check_dependency_p && dependent_scope_p (scope))))
{
/* We're optimizing away the call to cp_parser_lookup_name, but
we still need to do this. */
@@ -18667,9 +18667,9 @@ cp_parser_template_name (cp_parser* parser,
found = true;
}
- /* "in a type-only context" */
+ /* "that follows the keyword template"..."in a type-only context" */
if (!found && scope
- && tag_type != none_type
+ && (template_keyword_p || tag_type != none_type)
&& dependentish_scope_p (scope)
&& cp_parser_nth_token_starts_template_argument_list_p (parser, 1))
found = true;
@@ -18680,7 +18680,7 @@ cp_parser_template_name (cp_parser* parser,
cp_parser_error (parser, "expected template-name");
return error_mark_node;
}
- else if (decl == error_mark_node)
+ else if (!DECL_P (decl) && !is_overloaded_fn (decl))
/* Repeat the lookup at instantiation time. */
decl = identifier;
}
@@ -6,6 +6,6 @@ template <typename T> struct A
{
template <typename U> struct B
{
- A<T>::template B<U> foo(); // { dg-error "" "" { target c++17_down } }
+ A<T>::template B<U> foo();
};
};
new file mode 100644
@@ -0,0 +1,12 @@
+// PR c++/102300
+
+template<typename T>
+struct holder
+{
+ template<typename F> struct fn {};
+
+ struct t1 : fn<T> {}; // pass
+ struct t2 : holder<T >::fn<T> {}; // fail
+ struct t3 : holder<T >::template fn<T> {}; // fail
+ struct t4 : holder<T*>::template fn<T> {}; // pass
+};