diff options
Diffstat (limited to 'gcc/java/parse.y')
| -rw-r--r-- | gcc/java/parse.y | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 75ffbc3..3e5bd74 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -7520,7 +7520,7 @@ java_stabilize_reference (node) { tree op0 = TREE_OPERAND (node, 0); tree op1 = TREE_OPERAND (node, 1); - TREE_OPERAND (node, 0) = build1 (SAVE_EXPR, TREE_TYPE (op0), op0); + TREE_OPERAND (node, 0) = save_expr (op0); TREE_OPERAND (node, 1) = java_stabilize_reference (op1); return node; } @@ -7935,9 +7935,13 @@ java_complete_lhs (node) /* Now complete the RHS. We write it back later on. */ nn = java_complete_tree (TREE_OPERAND (node, 1)); + if ((cn = patch_string (nn))) + nn = cn; + /* The last part of the rewrite for E1 op= E2 is to have E1 = (T)(E1 op E2), with T being the type of E1. */ - nn = build_cast (EXPR_WFL_LINECOL (wfl_op2), TREE_TYPE (lvalue), nn); + nn = java_complete_tree (build_cast (EXPR_WFL_LINECOL (wfl_op2), + TREE_TYPE (lvalue), nn)); } /* If we're about to patch a NEW_ARRAY_INIT, we call a special @@ -9384,7 +9388,6 @@ build_string_concatenation (op1, op2) { tree result; int side_effects = TREE_SIDE_EFFECTS (op1) | TREE_SIDE_EFFECTS (op2); - /* Try to do some static optimization */ if ((result = string_constant_concatenation (op1, op2))) |