diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 448626015a7fb83064b17cea24244106ee93f2c1..f657b17152e75931669414381d88cf1e70f5f41d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-13  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	* convert.c (convert_to_integer): Make a CONVERT_EXPR when there is a
+	need to generate code instead of a NOP_EXPR.
+
 2004-05-13  Ian Lance Taylor  <ian@wasabisystems.com>
 
 	* gcc.c (default_compilers): Fill out initializers for new Fortran
diff --git a/gcc/convert.c b/gcc/convert.c
index 5f5d50e0f3bce7dce11877624d9148a236cacc84..ef0d1f568cf813c6b19fb6a3b1a6c8adb25b25fe 100644
--- a/gcc/convert.c
+++ b/gcc/convert.c
@@ -665,7 +665,7 @@ convert_to_integer (tree type, tree expr)
 	  break;
 	}
 
-      return build1 (NOP_EXPR, type, expr);
+      return build1 (CONVERT_EXPR, type, expr);
 
     case REAL_TYPE:
       return build1 (FIX_TRUNC_EXPR, type, expr);