diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 178b181d541..159941cec25 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-01  Roger Sayle  <roger@eyesopen.com>
+
+	* tree.c (int_fits_type_p): Compare the result of force_fit_type
+	with the original constant rather than require TREE_OVERFLOW.
+
 2005-01-01  Steven Bosscher  <stevenb@suse.de>
 
 	PR middle-end/17544
diff --git a/gcc/tree.c b/gcc/tree.c
index d81abb2df9d..ca97e30351e 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -1,6 +1,6 @@
 /* Language-independent node constructors for parse phase of GNU compiler.
    Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -4926,10 +4926,11 @@ int_fits_type_p (tree c, tree type)
   /* Or to force_fit_type, if nothing else.  */
   else
     {
-      c = copy_node (c);
-      TREE_TYPE (c) = type;
-      c = force_fit_type (c, -1, false, false);
-      return !TREE_OVERFLOW (c);
+      tree n = copy_node (c);
+      TREE_TYPE (n) = type;
+      n = force_fit_type (n, -1, false, false);
+      return TREE_INT_CST_HIGH (n) == TREE_INT_CST_HIGH (c)
+             && TREE_INT_CST_LOW (n) == TREE_INT_CST_LOW (c);
     }
 }