summaryrefslogtreecommitdiff
path: root/gcc/java/parse.y
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java/parse.y')
-rw-r--r--gcc/java/parse.y8
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 72eccbffaf3..9a343107e15 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -9370,8 +9370,12 @@ patch_binop (node, wfl_op1, wfl_op2)
TREE_TYPE (node) = prom_type;
TREE_SIDE_EFFECTS (node) = TREE_SIDE_EFFECTS (op1) | TREE_SIDE_EFFECTS (op2);
- /* fold does not respect side-effect order as required for Java but not C. */
- if (! TREE_SIDE_EFFECTS (node))
+ /* fold does not respect side-effect order as required for Java but not C.
+ * Also, it sometimes create SAVE_EXPRs which are bad when emitting
+ * bytecode.
+ */
+ if (flag_emit_class_files ? (TREE_CONSTANT (op1) && TREE_CONSTANT (op2))
+ : ! TREE_SIDE_EFFECTS (node))
node = fold (node);
return node;
}