From 7c3f7c03af325def409fd42423e73d428869eaa7 Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Tue, 6 Apr 1999 07:27:19 -0700 Subject: [PATCH] parse.y (patch_binop): Don't fold if non-constant and emiting class files. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit � * parse.y (patch_binop): Don't fold if non-constant and emiting class files. From-SVN: r26215 --- gcc/java/parse.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/java/parse.c b/gcc/java/parse.c index c402f12a7c5..69f18618b72 100644 --- a/gcc/java/parse.c +++ b/gcc/java/parse.c @@ -11971,8 +11971,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; } -- 2.30.2