aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMark Mitchell <mark@markmitchell.com>1999-03-02 23:29:37 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>1999-03-02 23:29:37 +0000
commit642b32a58a733af03e442b602612666254d94677 (patch)
treea52f6573aec554b2faaf6a5084f7ed3267445490 /gcc
parent2eb7ccb05ef746cc79535e418b23f1da6c89d136 (diff)
downloadgcc-642b32a58a733af03e442b602612666254d94677.zip
gcc-642b32a58a733af03e442b602612666254d94677.tar.gz
gcc-642b32a58a733af03e442b602612666254d94677.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/decl.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8e82f27..3a7d369 100644
--- 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 231a598..9b5b13b 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".