From ef0fec0643369012d898a64bcd349228e0a612f3 Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Sat, 9 Jan 1999 04:49:05 -0800 Subject: [PATCH] parse.y (build_new_array_init): Don't set EXPR_WFL_LINECOL on CONSTRUCTOR (since that trashes TREE_CST_RTL). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit � * 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. From-SVN: r24579 --- gcc/java/expr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 4c5d1bb27f0..136415ba378 100644 --- 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; -- 2.30.2