This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: java/expr.c fixlet
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Cc: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Date: 29 Apr 2005 14:17:15 -0600
- Subject: Patch: FYI: java/expr.c fixlet
- Reply-to: tromey at redhat dot com
I'm checking this in on the trunk.
Andreas Tobler pointed out that a recent gcj change broke bootstrap,
and Andrew Pinski wrote this patch but didn't have time to check it
in. So, I'm doing it.
Tom
Index: ChangeLog
from Andrew Pinski <pinskia@gcc.gnu.org>
* expr.c (force_evaluation_order): Declare 'saved' earlier.
Index: expr.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/expr.c,v
retrieving revision 1.223
diff -u -r1.223 expr.c
--- expr.c 29 Apr 2005 18:42:48 -0000 1.223
+++ expr.c 29 Apr 2005 20:18:51 -0000
@@ -3523,13 +3523,14 @@
/* Promote types smaller than integer. This is required by
some ABIs. */
tree type = TREE_TYPE (TREE_VALUE (arg));
+ tree saved;
if (targetm.calls.promote_prototypes (type)
&& INTEGRAL_TYPE_P (type)
&& INT_CST_LT_UNSIGNED (TYPE_SIZE (type),
TYPE_SIZE (integer_type_node)))
TREE_VALUE (arg) = fold_convert (integer_type_node, TREE_VALUE (arg));
- tree saved = save_expr (force_evaluation_order (TREE_VALUE (arg)));
+ saved = save_expr (force_evaluation_order (TREE_VALUE (arg)));
cmp = (cmp == NULL_TREE ? saved :
build2 (COMPOUND_EXPR, void_type_node, cmp, saved));
TREE_VALUE (arg) = saved;