diff options
| author | Alexandre Petit-Bianco <apbianco@cygnus.com> | 1999-11-09 20:30:57 +0000 |
|---|---|---|
| committer | Alexandre Petit-Bianco <apbianco@gcc.gnu.org> | 1999-11-09 12:30:57 -0800 |
| commit | 8226320b92d595423ab9b5dce04952886f5edffa (patch) | |
| tree | 7c8dcff01600edbaa6b0414780fc68227c7d805e /gcc | |
| parent | dc8842bf9bae4830019211c27eb57637983a0e9c (diff) | |
| download | gcc-8226320b92d595423ab9b5dce04952886f5edffa.zip gcc-8226320b92d595423ab9b5dce04952886f5edffa.tar.gz gcc-8226320b92d595423ab9b5dce04952886f5edffa.tar.bz2 | |
parse.y (source_end_java_method): Resume permanent allocation, reversing Apr 27 1998 patch.
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/java/parse.c | 3 | ||||
| -rw-r--r-- | gcc/java/parse.y | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index b516afd..d15c7bd 100644 --- 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 2fa2660..6aad813 100644 --- 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 ebdaa7b..492207e 100644 --- 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; |