summaryrefslogtreecommitdiff
path: root/gcc/java
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/java')
-rw-r--r--gcc/java/ChangeLog4
-rw-r--r--gcc/java/typeck.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index fba18330945..61f0a6fdf8d 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-20 Andrew Haley <aph@redhat.com>
+
+ * typeck.c: Use fold_convert for ints and booleans.
+
2004-12-17 Andrew Haley <aph@redhat.com>
PR java/18931
diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c
index 2b85e475d95..dcd201de777 100644
--- a/gcc/java/typeck.c
+++ b/gcc/java/typeck.c
@@ -130,7 +130,7 @@ convert (tree type, tree expr)
if (code == VOID_TYPE)
return build1 (CONVERT_EXPR, type, expr);
if (code == BOOLEAN_TYPE || code == CHAR_TYPE)
- return fold (build1 (CONVERT_EXPR, type, expr));
+ return fold_convert (type, expr);
if (code == INTEGER_TYPE)
{
if ((really_constant_p (expr)