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

+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

gcc/cp/decl.c

@@ -2198,7 +2198,6 @@ 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);
 
   if (previous_class_type)
@@ -2339,7 +2338,6 @@ pop_from_top_level ()
 
   free (s);
 
-  if (current_function_decl)
   pop_cp_function_context (NULL_TREE);
 }