From baa923061b61df003f5671dc27548af39bb42d3d Mon Sep 17 00:00:00 2001 From: Diego Novillo Date: Thu, 28 Jul 2005 18:28:12 +0000 Subject: expr.c (expand_load_internal): Fix missing parens in predicate. * expr.c (expand_load_internal): Fix missing parens in predicate. From-SVN: r102504 --- gcc/java/ChangeLog | 5 +++++ gcc/java/expr.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'gcc') diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index da643f4..cd908fd 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2005-07-28 Diego Novillo + + * expr.c (expand_load_internal): Fix missing parens in + predicate. + 2005-07-28 Andrew Haley * expr.c (expand_load_internal): Convert to destination type. diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 5c5a56c..165aea7 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -1321,7 +1321,7 @@ expand_load_internal (int index, tree type, int pc) value into it. Then we push this new local on the stack. Hopefully this all gets optimized out. */ copy = build_decl (VAR_DECL, NULL_TREE, type); - if (INTEGRAL_TYPE_P (type) || POINTER_TYPE_P (type) + if ((INTEGRAL_TYPE_P (type) || POINTER_TYPE_P (type)) && TREE_TYPE (copy) != TREE_TYPE (var)) var = convert (type, var); java_add_local_var (copy); -- cgit v1.1