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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8e82f27c5c3346a95188981522fe0b6e70f905d9..3a7d3694c7166887cae69c5c44559a112ca4a060 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+1999-03-02  Mark Mitchell  <mark@markmitchell.com>
+
+       * 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  <nathan@acm.org>
 
        * typeck.c (complete_type_or_else): Add VALUE arg, for helpful

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 231a598c55a4b3ef115cf88d4393cfe26d83d9eb..9b5b13b67916a5e2776e0cc3828df117acd07491 100644 (file)
--- 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);
 }
 \f
 /* Push a definition of struct, union or enum tag "name".