2004-12-20 Andrew Haley <aph@redhat.com>

        * typeck.c: Use fold_convert for ints and booleans.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@92419 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index fba1833..61f0a6f 100644 (file)
--- 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 2b85e47..dcd201d 100644 (file)
--- 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)