diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2006-05-31 01:18:24 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2006-05-31 01:18:24 +0000 |
| commit | c7baf9e9fbf7490574e20a9ed05dd6437161e1f3 (patch) | |
| tree | b3e908d52e8af5c738b5428ac3c6255b8efcebeb /gcc/cp | |
| parent | 7edd9592be510d1f0c46ca7060639f167d65abb1 (diff) | |
| download | gcc-c7baf9e9fbf7490574e20a9ed05dd6437161e1f3.zip gcc-c7baf9e9fbf7490574e20a9ed05dd6437161e1f3.tar.gz gcc-c7baf9e9fbf7490574e20a9ed05dd6437161e1f3.tar.bz2 | |
re PR c++/27808 (ICE with invalid friend declaration)
PR c++/27808
* parser.c (cp_parser_decl_specifier_seq): Issue errors about
"friend" specifiers that do not appear in class scopes.
PR c++/27808
* g++.dg/parse/friend6.C: New test.
From-SVN: r114259
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fcfb7f3..57d0110 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2006-05-30 Mark Mitchell <mark@codesourcery.com> + PR c++/27808 + * parser.c (cp_parser_decl_specifier_seq): Issue errors about + "friend" specifiers that do not appear in class scopes. + PR c++/27803 * class.c (check_bitfield_decl): Ensure that all bitfields have integral type. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 60a53c8..98d4c5e 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -7425,9 +7425,17 @@ cp_parser_decl_specifier_seq (cp_parser* parser, /* decl-specifier: friend */ case RID_FRIEND: - ++decl_specs->specs[(int) ds_friend]; - /* Consume the token. */ - cp_lexer_consume_token (parser->lexer); + if (!at_class_scope_p ()) + { + error ("%<friend%> used outside of class"); + cp_lexer_purge_token (parser->lexer); + } + else + { + ++decl_specs->specs[(int) ds_friend]; + /* Consume the token. */ + cp_lexer_consume_token (parser->lexer); + } break; /* function-specifier: |