diff options
Diffstat (limited to 'gcc/java/parse.c')
| -rw-r--r-- | gcc/java/parse.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/java/parse.c b/gcc/java/parse.c index f090ca5..dbefe7e 100644 --- a/gcc/java/parse.c +++ b/gcc/java/parse.c @@ -10491,7 +10491,8 @@ java_complete_lhs (node) /* They complete the array creation expression, if no errors were found. */ CAN_COMPLETE_NORMALLY (node) = 1; - return (flag ? error_mark_node : patch_newarray (node)); + return (flag ? error_mark_node + : force_evaluation_order (patch_newarray (node))); case NEW_CLASS_EXPR: case CALL_EXPR: @@ -11870,7 +11871,10 @@ patch_binop (node, wfl_op1, wfl_op2) TREE_TYPE (node) = prom_type; TREE_SIDE_EFFECTS (node) = TREE_SIDE_EFFECTS (op1) | TREE_SIDE_EFFECTS (op2); - return fold (node); + /* fold does not respect side-effect order as required for Java but not C. */ + if (! TREE_SIDE_EFFECTS (node)) + node = fold (node); + return node; } /* Concatenate the STRING_CST CSTE and STRING. When AFTER is a non |