diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2006-10-04 06:53:55 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2006-10-04 06:53:55 +0000 |
| commit | 1cd7d7bf707cf5c6ecdf223de4175c5a6d01ca7c (patch) | |
| tree | aab97d8fb322605f13a935c7e6e41f7e908c9be8 /gcc/cp/parser.c | |
| parent | 404d84017e5ff32987ec19d70e57fd20d15beea5 (diff) | |
| download | gcc-1cd7d7bf707cf5c6ecdf223de4175c5a6d01ca7c.zip gcc-1cd7d7bf707cf5c6ecdf223de4175c5a6d01ca7c.tar.gz gcc-1cd7d7bf707cf5c6ecdf223de4175c5a6d01ca7c.tar.bz2 | |
re PR c++/29020 (ICE using A<N>::A instead of A<N> in friend declaration)
PR c++/29020
* friend.c (do_friend): Improve comments; add assertion.
* parser.c (cp_parser_nested_name_specifier_opt): Resolve
typenames for qualified names used in declarations, even when
caching qualified name lookup.
PR c++/29020
* g++.dg/template/friend48.C: New test.
From-SVN: r117425
Diffstat (limited to 'gcc/cp/parser.c')
| -rw-r--r-- | gcc/cp/parser.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 05151cd..2672f15 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -3632,10 +3632,17 @@ cp_parser_nested_name_specifier_opt (cp_parser *parser, { /* Grab the nested-name-specifier and continue the loop. */ cp_parser_pre_parsed_nested_name_specifier (parser); + /* If we originally encountered this nested-name-specifier + with IS_DECLARATION set to false, we will not have + resolved TYPENAME_TYPEs, so we must do so here. */ if (is_declaration && TREE_CODE (parser->scope) == TYPENAME_TYPE) - parser->scope = resolve_typename_type (parser->scope, - /*only_current_p=*/false); + { + new_scope = resolve_typename_type (parser->scope, + /*only_current_p=*/false); + if (new_scope != error_mark_node) + parser->scope = new_scope; + } success = true; continue; } |