From 642b32a58a733af03e442b602612666254d94677 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Tue, 2 Mar 1999 23:29:37 +0000 Subject: [PATCH] decl.c (maybe_push_to_top_level): Always call push_cp_function_context. * decl.c (maybe_push_to_top_level): Always call push_cp_function_context. (pop_from_top_level): Always call pop_cp_function_context. From-SVN: r25553 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8e82f27c5c3..3a7d3694c71 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +1999-03-02 Mark Mitchell + + * decl.c (maybe_push_to_top_level): Always call + push_cp_function_context. + (pop_from_top_level): Always call pop_cp_function_context. + 1999-02-26 Nathan Sidwell * typeck.c (complete_type_or_else): Add VALUE arg, for helpful diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 231a598c55a..9b5b13b6791 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2198,8 +2198,7 @@ maybe_push_to_top_level (pseudo) struct binding_level *b = inner_binding_level; tree old_bindings = NULL_TREE; - if (current_function_decl) - push_cp_function_context (NULL_TREE); + push_cp_function_context (NULL_TREE); if (previous_class_type) old_bindings = store_bindings (previous_class_values, old_bindings); @@ -2339,8 +2338,7 @@ pop_from_top_level () free (s); - if (current_function_decl) - pop_cp_function_context (NULL_TREE); + pop_cp_function_context (NULL_TREE); } /* Push a definition of struct, union or enum tag "name". -- 2.30.2