diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 1 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 4 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/lookup/ns4.C | 20 |
6 files changed, 33 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6e048ca..c044294 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2010-04-07 Jason Merrill <jason@redhat.com> + * name-lookup.c (current_decl_namespace): Non-static. + (pop_nested_namespace): Sanity check. + * cp-tree.h: Declare current_decl_namespace. + * decl.c (grokvardecl): Use it instead of current_namespace. + (grokfndecl): Likewise. + PR c++/38392 * pt.c (tsubst_friend_function): Instatiate a friend that has already been used. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 1350619..f71317b 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -4644,6 +4644,7 @@ extern tree pushdecl_top_level_and_finish (tree, tree); extern tree check_for_out_of_scope_variable (tree); extern void print_other_binding_stack (struct cp_binding_level *); extern tree maybe_push_decl (tree); +extern tree current_decl_namespace (void); /* decl.c */ extern tree poplevel (int, int, int); diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 4ae924b..bfbe3ca 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6758,7 +6758,7 @@ grokfndecl (tree ctype, if (in_namespace) set_decl_namespace (decl, in_namespace, friendp); else if (!ctype) - DECL_CONTEXT (decl) = FROB_CONTEXT (current_namespace); + DECL_CONTEXT (decl) = FROB_CONTEXT (current_decl_namespace ()); /* `main' and builtins have implicit 'C' linkage. */ if ((MAIN_NAME_P (declarator) @@ -7020,7 +7020,7 @@ grokvardecl (tree type, /* An explicit "extern" specifier indicates a namespace-scope variable. */ if (declspecs->storage_class == sc_extern) - scope = current_namespace; + scope = current_decl_namespace (); else if (!at_function_scope_p ()) scope = current_scope (); } diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index 7b43d30..b4ac49f 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -3170,7 +3170,7 @@ set_decl_namespace (tree decl, tree scope, bool friendp) /* Return the namespace where the current declaration is declared. */ -static tree +tree current_decl_namespace (void) { tree result; @@ -3342,6 +3342,7 @@ void pop_nested_namespace (tree ns) { timevar_push (TV_NAME_LOOKUP); + gcc_assert (current_namespace == ns); while (ns != global_namespace) { pop_namespace (); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3df0787..4156ad4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,7 @@ 2010-04-07 Jason Merrill <jason@redhat.com> + * g++.dg/lookup/ns4.C: New. + PR c++/38392 * g++.dg/template/friend51.C: New test. diff --git a/gcc/testsuite/g++.dg/lookup/ns4.C b/gcc/testsuite/g++.dg/lookup/ns4.C new file mode 100644 index 0000000..a28cda6 --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/ns4.C @@ -0,0 +1,20 @@ +// { dg-do link } + +namespace N { + void f(); +} + +void N::f() +{ + extern int i; + extern void g(); + i = 1; + g(); +} + +namespace N { + int i; + void g() { } +} + +int main() { } |