diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2005-02-14 17:50:58 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2005-02-14 17:50:58 +0000 |
| commit | f769035f7cca45e5236f797864183e18f8c27b58 (patch) | |
| tree | c4a556e8532e7b3fed4462d2fca4e630ff7f9a8c /gcc | |
| parent | 6a720599bb2e3ea01142d51ad61d8c589fa8c1fe (diff) | |
| download | gcc-f769035f7cca45e5236f797864183e18f8c27b58.zip gcc-f769035f7cca45e5236f797864183e18f8c27b58.tar.gz gcc-f769035f7cca45e5236f797864183e18f8c27b58.tar.bz2 | |
re PR c++/19608 (ICE after friend function definition in local class)
cp:
PR c++/19608
* parser.c (cp_parser_late_parsing_for_member): Use
current_function_decl as scope to push to and from.
testsuite:
PR c++/19608
* g++.dg/parse/local-class1.C: New.
From-SVN: r95036
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/local-class1.C | 14 |
4 files changed, 25 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index add1476..b8f356f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2005-02-14 Nathan Sidwell <nathan@codesourcery.com> + PR c++/19608 + * parser.c (cp_parser_late_parsing_for_member): Use + current_function_decl as scope to push to and from. + PR c++/19884 * pt.c (check_explicit_specialization): Make sure namespace binding lookup found an overloaded function. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 453bc69..f38f6fb 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -15286,9 +15286,10 @@ cp_parser_late_parsing_for_member (cp_parser* parser, tree member_function) tokens = DECL_PENDING_INLINE_INFO (member_function); DECL_PENDING_INLINE_INFO (member_function) = NULL; DECL_PENDING_INLINE_P (member_function) = 0; - /* If this was an inline function in a local class, enter the scope - of the containing function. */ - function_scope = decl_function_context (member_function); + + /* If this is a local class, enter the scope of the containing + function. */ + function_scope = current_function_decl; if (function_scope) push_function_context_to (function_scope); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 61fef17..8384855 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2005-02-14 Nathan Sidwell <nathan@codesourcery.com> + PR c++/19608 + * g++.dg/parse/local-class1.C: New. + PR c++/19895 * g++.dg/parse/ptrmem3.C: New. diff --git a/gcc/testsuite/g++.dg/parse/local-class1.C b/gcc/testsuite/g++.dg/parse/local-class1.C new file mode 100644 index 0000000..4fc7e6e --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/local-class1.C @@ -0,0 +1,14 @@ + // Copyright (C) 2005 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 14 Feb 2005 <nathan@codesourcery.com> + +// Origin: Jorn Wolfgang Rennecke <amylaar@gcc.gnu.org> +// Bug 19608: ICE on invalid + + +void f () +{ + class c + { + friend void g () { } // { dg-error "local class definition" "" } + }; +} |