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

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index f46411a3caac2294f880e795c6eda9aa09ae3bda..70dd77366e35ad5475add4d6d6fe6a5a13528df2 100644 (file)
--- 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 776c6f3db73a243263b04a8c4597949aa582ba83..c5fe6690a2c8374ad0271c2075261473842ad5ab 100644 (file)
--- 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: