summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>2004-08-20 09:13:12 +0000
committernathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>2004-08-20 09:13:12 +0000
commit59d526f9c5354be1a9ac840aafb76473a7f31b64 (patch)
tree4008f9e7bab98c919ce8e8f44d4cdcfc93150a6c
parentaac0b61ce812a644ea424b3c2c270768237dbf32 (diff)
downloadppe42-gcc-59d526f9c5354be1a9ac840aafb76473a7f31b64.tar.gz
ppe42-gcc-59d526f9c5354be1a9ac840aafb76473a7f31b64.zip
* expr.c (build_java_arrayaccess): Use convert to change
len's type. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86307 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/java/ChangeLog7
-rw-r--r--gcc/java/expr.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index b16f9f35252..5af0be7ecec 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-20 Nathan Sidwell <nathan@codesourcery.com>
+
+ * expr.c (build_java_arrayaccess): Use convert to change
+ len's type.
+
2004-08-19 Bryce McKinlay <mckinlay@redhat.com>
* class.c (make_local_function_alias): Allocate extra space for 'L'
@@ -8587,7 +8592,7 @@
properly initialize `finished_label'. Don't emit gotos for empty
try statements.
-2000-03-19 Martin v. Löwis <loewis@informatik.hu-berlin.de>
+2000-03-19 Martin v. Löwis <loewis@informatik.hu-berlin.de>
* except.c (emit_handlers): Clear catch_clauses_last.
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 9472794dfee..97f540aac16 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -763,8 +763,8 @@ build_java_arrayaccess (tree array, tree type, tree index)
* Note this is equivalent to and more efficient than:
* INDEX < 0 || INDEX >= LEN && throw ... */
tree test;
- tree len = build_java_array_length_access (array);
- TREE_TYPE (len) = unsigned_int_type_node;
+ tree len = convert (unsigned_int_type_node,
+ build_java_array_length_access (array));
test = fold (build2 (GE_EXPR, boolean_type_node,
convert (unsigned_int_type_node, index),
len));
OpenPOWER on IntegriCloud