diff options
| author | Jason Merrill <jason@gcc.gnu.org> | 1999-09-17 02:30:59 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1999-09-17 02:30:59 -0400 |
| commit | 7c39cdd458fb36d1c0ba5fa32d4dd2444ad7505b (patch) | |
| tree | c71b470fa21c1b262ae715daae48cd916f550fef /gcc | |
| parent | 905d7d33dac22133705f9fd69335470e4b8ae29c (diff) | |
| download | gcc-7c39cdd458fb36d1c0ba5fa32d4dd2444ad7505b.zip gcc-7c39cdd458fb36d1c0ba5fa32d4dd2444ad7505b.tar.gz gcc-7c39cdd458fb36d1c0ba5fa32d4dd2444ad7505b.tar.bz2 | |
revert
From-SVN: r29471
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 15 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 6 |
3 files changed, 5 insertions, 22 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5d8103c..7ab6527 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -8,12 +8,6 @@ (dump_function_decl): Don't be too talkative about function return type variety. -1999-09-16 Jason Merrill <jason@yorick.cygnus.com> - - * decl.c (saved_scope_p): New fn. - * class.c (pushclass): Don't clear class_cache_obstack if we have - saved scopes. - 1999-09-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * lex.c (init_cpp_parse): Call xcalloc, not malloc/bzero. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 3b63503..2c6a03f 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -4499,16 +4499,11 @@ pushclass (type, modify) /* Forcibly remove any old class remnants. */ invalidate_class_lookup_cache (); - /* Now, free the obstack on which we cached all the values. - We can't do this if we have saved scopes sitting around, since - they may have saved previous_class_values. */ - if (! saved_scope_p ()) - { - if (class_cache_firstobj) - obstack_free (&class_cache_obstack, class_cache_firstobj); - class_cache_firstobj - = (char*) obstack_finish (&class_cache_obstack); - } + /* Now, free the obstack on which we cached all the values. */ + if (class_cache_firstobj) + obstack_free (&class_cache_obstack, class_cache_firstobj); + class_cache_firstobj + = (char*) obstack_finish (&class_cache_obstack); } /* If we're about to enter a nested class, clear diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index d8ad184..cd42511 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2481,12 +2481,6 @@ pop_from_top_level () free (s); } - -int -saved_scope_p () -{ - return current_saved_scope != NULL; -} /* Push a definition of struct, union or enum tag "name". into binding_level "b". "type" should be the type node, |