parse.y (source_end_java_method): Resume permanent allocation, reversing Apr 27 1998...

Tue Nov  9 12:12:38 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* parse.y (source_end_java_method): Resume permanent allocation,
 	reversing Apr 27 1998 patch.
	(patch_string_cst): Pop obstacks after having pushed the permanent
 	ones.

From-SVN: r30462

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index b516afd94073a4ded8e0260fb323db7d05ea81cd..d15c7bd9e0856d8708acea86b509956781df8d72 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov  9 12:12:38 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+       * parse.y (source_end_java_method): Resume permanent allocation,
+       reversing Apr 27 1998 patch.
+       (patch_string_cst): Pop obstacks after having pushed the permanent
+       ones.
+
 1999-11-05  Tom Tromey  <tromey@cygnus.com>
 
        * class.c (finish_class): Emit inlined methods if any native

diff --git a/gcc/java/parse.c b/gcc/java/parse.c
index 2fa2660180e9ab6ddbf91b2d1598b1c9a8c9cd56..6aad8130d48fdfad80566c5c32a551188d6baae4 100644 (file)
--- a/gcc/java/parse.c
+++ b/gcc/java/parse.c
@@ -8448,7 +8448,7 @@ source_end_java_method ()
     }
 
   current_function_decl = NULL_TREE;
-  /*  permanent_allocation (1); */
+  permanent_allocation (1);
   java_parser_context_restore_global ();
   asynchronous_exceptions = flag_asynchronous_exceptions;
 }
@@ -12842,6 +12842,7 @@ patch_string_cst (node)
       node = get_identifier (TREE_STRING_POINTER (node));
       location = alloc_name_constant (CONSTANT_String, node);
       node = build_ref_from_constant_pool (location);
+      pop_obstacks ();
     }
   TREE_TYPE (node) = string_ptr_type_node;
   TREE_CONSTANT (node) = 1;

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index ebdaa7bc47d520f338b943890865ea0a154b5d40..492207ec8dfd4197a591cec4e0895b364c4ac68e 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -5843,7 +5843,7 @@ source_end_java_method ()
     }
 
   current_function_decl = NULL_TREE;
-  /*  permanent_allocation (1); */
+  permanent_allocation (1);
   java_parser_context_restore_global ();
   asynchronous_exceptions = flag_asynchronous_exceptions;
 }
@@ -10237,6 +10237,7 @@ patch_string_cst (node)
       node = get_identifier (TREE_STRING_POINTER (node));
       location = alloc_name_constant (CONSTANT_String, node);
       node = build_ref_from_constant_pool (location);
+      pop_obstacks ();
     }
   TREE_TYPE (node) = string_ptr_type_node;
   TREE_CONSTANT (node) = 1;