diff options
| author | reichelt <reichelt@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-08-03 02:49:07 +0000 |
|---|---|---|
| committer | reichelt <reichelt@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-08-03 02:49:07 +0000 |
| commit | 4b2ee8a48e4bc57f8169ce5f2aad174799e6ee24 (patch) | |
| tree | 94966bfa3bf0d1281f415061cff6db93401e69c4 /gcc/cp | |
| parent | 334ba6ae0f620775feaa9911ecdbfbfc5357f317 (diff) | |
| download | gcc-4b2ee8a48e4bc57f8169ce5f2aad174799e6ee24.tar.gz | |
PR c++/27508
* parser.c (cp_parser_unqualified_id): Check for invalid scopes
when parsing destructor names.
* g++.dg/parse/dtor9.C: New test.
* g++.dg/parse/dtor10.C: New test.
* g++.dg/other/error7.C: Adjust error-marker.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115896 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 19 |
2 files changed, 21 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 93d4d235949..47513ef9018 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2006-08-03 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + PR c++/27508 + * parser.c (cp_parser_unqualified_id): Check for invalid scopes + when parsing destructor names. + PR c++/28274 * decl.c (duplicate_decls): Call check_default_args here. (start_preparsed_function): Do not call check_default_args. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index c4224019da7..aa297874f30 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -3416,9 +3416,24 @@ cp_parser_unqualified_id (cp_parser* parser, object_scope = parser->object_scope; qualifying_scope = parser->qualifying_scope; + /* Check for invalid scopes. */ + if (scope == error_mark_node) + { + cp_parser_skip_to_end_of_statement (parser); + return error_mark_node; + } + if (scope && TREE_CODE (scope) == NAMESPACE_DECL) + { + if (!cp_parser_uncommitted_to_tentative_parse_p (parser)) + error ("scope %qT before %<~%> is not a class-name", scope); + cp_parser_skip_to_end_of_statement (parser); + return error_mark_node; + } + gcc_assert (!scope || TYPE_P (scope)); + /* If the name is of the form "X::~X" it's OK. */ token = cp_lexer_peek_token (parser->lexer); - if (scope && TYPE_P (scope) + if (scope && token->type == CPP_NAME && (cp_lexer_peek_nth_token (parser->lexer, 2)->type == CPP_OPEN_PAREN) @@ -3500,7 +3515,7 @@ cp_parser_unqualified_id (cp_parser* parser, destructor is the same as the name of the qualifying class. That allows us to keep parsing after running into ill-formed destructor names. */ - if (type_decl == error_mark_node && scope && TYPE_P (scope)) + if (type_decl == error_mark_node && scope) return build_nt (BIT_NOT_EXPR, scope); else if (type_decl == error_mark_node) return error_mark_node; |