aboutsummaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
authorAlexandre Petit-Bianco <apbianco@cygnus.com>2000-03-30 15:41:57 -0800
committerAlexandre Petit-Bianco <apbianco@gcc.gnu.org>2000-03-30 15:41:57 -0800
commit64ea4a5e272df56ba687556bfe01f2a5ea9d50d8 (patch)
treef11cb043f451d7a5773d2a5b29898309dda372d7 /gcc/java
parent694f020b138651c6d50ce97f83f8ff936ef7bc01 (diff)
downloadgcc-64ea4a5e272df56ba687556bfe01f2a5ea9d50d8.zip
gcc-64ea4a5e272df56ba687556bfe01f2a5ea9d50d8.tar.gz
gcc-64ea4a5e272df56ba687556bfe01f2a5ea9d50d8.tar.bz2
expr.c (java_lang_expand_expr): Added Anthony's Thu Jan 6 2000 patch missing hunk.
Thu Mar 30 15:26:56 2000 Alexandre Petit-Bianco <apbianco@dcygnus.com> * expr.c (java_lang_expand_expr): Added Anthony's Thu Jan 6 2000 patch missing hunk. Fixed indentation. From-SVN: r32839
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/expr.c12
2 files changed, 12 insertions, 5 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index f46411a..70dd773 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 30 15:26:56 2000 Alexandre Petit-Bianco <apbianco@dcygnus.com>
+
+ * expr.c (java_lang_expand_expr): Added Anthony's Thu Jan 6 2000
+ patch missing hunk. Fixed indentation.
+
2000-03-30 Tom Tromey <tromey@cygnus.com>
* gjavah.c (D_NAN_MASK): Only define as word-reversed when
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 776c6f3..c5fe669 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -2022,8 +2022,10 @@ java_lang_expand_expr (exp, target, tmode, modifier)
if (TREE_CONSTANT (init)
&& ilength >= 10 && JPRIMITIVE_TYPE_P (element_type))
{
- tree init_decl = build_decl (VAR_DECL, generate_name (),
- TREE_TYPE (init));
+ tree init_decl;
+ push_obstacks (&permanent_obstack, &permanent_obstack);
+ init_decl = build_decl (VAR_DECL, generate_name (),
+ TREE_TYPE (init));
pushdecl_top_level (init_decl);
TREE_STATIC (init_decl) = 1;
DECL_INITIAL (init_decl) = init;
@@ -2031,12 +2033,12 @@ java_lang_expand_expr (exp, target, tmode, modifier)
TREE_READONLY (init_decl) = 1;
TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (init_decl)) = 1;
make_decl_rtl (init_decl, NULL, 1);
+ pop_obstacks ();
init = init_decl;
}
expand_assignment (build (COMPONENT_REF, TREE_TYPE (data_fld),
- build1 (INDIRECT_REF, array_type, array_decl),
- data_fld),
- init, 0, 0);
+ build1 (INDIRECT_REF, array_type,
+ array_decl), data_fld), init, 0, 0);
return tmp;
}
case BLOCK: