aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/java/ChangeLog4
-rw-r--r--gcc/java/typeck.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index aaca59d..b6b4a51 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-08 Roger Sayle <roger@eyesopen.com>
+
+ * typeck.c (convert): Only clear TREE_OVERFLOW on INTEGER_CST nodes.
+
2005-06-06 Jakub Jelinek <jakub@redhat.com>
* jv-scan.c (fatal_error, warning, warning0): Use gmsgid instead of
diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c
index a15b1d7..ae176da 100644
--- a/gcc/java/typeck.c
+++ b/gcc/java/typeck.c
@@ -142,7 +142,8 @@ convert (tree type, tree expr)
overflows in a narrowing integer conversion, but Java
doesn't care. */
tree tmp = fold (convert_to_integer (type, expr));
- TREE_OVERFLOW (tmp) = 0;
+ if (TREE_CODE (tmp) == INTEGER_CST)
+ TREE_OVERFLOW (tmp) = 0;
return tmp;
}
}