diff options
| -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, 22 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7603401c4fc..3f7d508db23 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +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 2c6a03f7156..3b63503c5c0 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -4499,11 +4499,16 @@ pushclass (type, modify) /* Forcibly remove any old class remnants. */ invalidate_class_lookup_cache (); - /* 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); + /* 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); + } } /* If we're about to enter a nested class, clear diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index cd42511d5e1..d8ad184cc2f 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2481,6 +2481,12 @@ 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, |
