�

	* parse.y (build_new_array_init):  Don't set EXPR_WFL_LINECOL
	on CONSTRUCTOR (since that trashes TREE_CST_RTL).
	(patch_new_array_init):  Clear TREE_CONSTANT also if INDIRECT_REF.
	(register_fields):  Set TREE_STATIC on NEW_ARRAY_INIT, not on
	CONSTRUCTOR (which causes expand_expr to call output_constant_def).
	* expr.c (java_lang_expand_expr):  Check TREE_STATIC of NEW_ARRAY_INIT.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@24579 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 4c5d1bb..136415b 100644 (file)
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -1768,7 +1768,7 @@ java_lang_expand_expr (exp, target, tmode, modifier)
        tree array_decl;
 #if 0
        /* Enable this once we can set the vtable field statically.  FIXME */
-       if (TREE_CONSTANT (init) && TREE_STATIC (init)
+       if (TREE_CONSTANT (init) && TREE_STATIC (exp)
            && JPRIMITIVE_TYPE_P (element_type))
          {
            tree temp, value, init_decl;