diff options
| -rw-r--r-- | gcc/cp/parser.c | 13 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/lookup16.C | 23 |
2 files changed, 29 insertions, 7 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 80d903c..2340795 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -23794,13 +23794,10 @@ cp_parser_class_name (cp_parser *parser, bool enum_ok) { tree decl; - tree scope; - bool typename_p; - cp_token *token; tree identifier = NULL_TREE; /* All class-names start with an identifier. */ - token = cp_lexer_peek_token (parser->lexer); + cp_token *token = cp_lexer_peek_token (parser->lexer); if (token->type != CPP_NAME && token->type != CPP_TEMPLATE_ID) { cp_parser_error (parser, "expected class-name"); @@ -23816,14 +23813,16 @@ cp_parser_class_name (cp_parser *parser, where we first want to look up A<T>::a in the class of the object expression, as per [basic.lookup.classref]. */ - scope = parser->scope ? parser->scope : parser->context->object_type; + tree scope = parser->scope ? parser->scope : parser->context->object_type; if (scope == error_mark_node) return error_mark_node; /* Any name names a type if we're following the `typename' keyword in a qualified name where the enclosing scope is type-dependent. */ - typename_p = (typename_keyword_p && scope && TYPE_P (scope) - && dependent_type_p (scope)); + const bool typename_p = (typename_keyword_p + && parser->scope + && TYPE_P (parser->scope) + && dependent_type_p (parser->scope)); /* Handle the common case (an identifier, but not a template-id) efficiently. */ if (token->type == CPP_NAME diff --git a/gcc/testsuite/g++.dg/template/lookup16.C b/gcc/testsuite/g++.dg/template/lookup16.C new file mode 100644 index 0000000..5b34c08 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/lookup16.C @@ -0,0 +1,23 @@ +// PR c++/94799 +// { dg-do compile { target c++11 } } + +template <typename> struct A { + typedef int type; + operator int(); +}; + +template <typename T> using B = A<T>; + +template <typename T> typename B<T>::type foo(B<T> b) +{ + auto r1 = b.operator typename A<T>::type(); + auto r2 = b.operator typename A<T>::template A<T>::type(); + auto r3 = b.operator typename B<T>::type(); + auto r4 = b.operator typename B<T>::template A<T>::type(); + return r1 + r2 + r3 + r4; +} + +void bar() +{ + foo(A<int>()); +} |