summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/java/ChangeLog4
-rw-r--r--gcc/java/expr.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index deaaa3132ce..52a07778aab 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-29 Andrew Pinski <pinskia@gcc.gnu.org>
+
+ * expr.c (force_evaluation_order): Declare 'saved' earlier.
+
2005-04-28 Andrew Haley <aph@redhat.com>
PR java/19285
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 3cc33aed68d..e61cd124159 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -3523,13 +3523,14 @@ force_evaluation_order (tree node)
/* 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;