aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/expr.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index ac40484..d3fb8a1 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-28 Andrew Pinski <pinskia@physics.uc.edu>
+
+ * expr.c (build_field_ref): Move variable
+ definition up.
+
2004-01-28 Andrew Haley <aph@redhat.com>
* expr.c (build_field_ref): Widen field offset.
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index fe77668..53aa45b 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -1523,8 +1523,9 @@ build_field_ref (tree self_value, tree self_class, tree name)
tree field_offset =
build (ARRAY_REF, integer_type_node, TYPE_OTABLE_DECL (output_class),
otable_index);
+ tree address;
field_offset = fold (convert (sizetype, field_offset));
- tree address
+ address
= fold (build (PLUS_EXPR,
build_pointer_type (TREE_TYPE (field_decl)),
self_value, field_offset));