diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 312106e8e953ad9e50e40bffb5a467278217811f..bbb9248bb5b6958cd262afd9f04463758af89c27 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-11  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR middle-end/22398
+	* fold-const.c (build_range_check): Convert high/low to etype
+	if we are only comparing against exp.
+
 2005-07-13  Daniel Berlin  <dberlin@dberlin.org>
 
 	Fix PR tree-optimization/22376
diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index 3bc27eb5d3bdbad05fe3af29429872e579817c32..0e414bc2bf17018866026c755da1fb4669e41c17 100644
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -3943,13 +3943,16 @@ build_range_check (tree type, tree exp, int in_p, tree low, tree high)
     return fold_convert (type, integer_one_node);
 
   if (low == 0)
-    return fold_build2 (LE_EXPR, type, exp, high);
+    return fold_build2 (LE_EXPR, type, exp,
+			fold_convert (etype, high));
 
   if (high == 0)
-    return fold_build2 (GE_EXPR, type, exp, low);
+    return fold_build2 (GE_EXPR, type, exp,
+			fold_convert (etype, low));
 
   if (operand_equal_p (low, high, 0))
-    return fold_build2 (EQ_EXPR, type, exp, low);
+    return fold_build2 (EQ_EXPR, type, exp,
+			fold_convert (etype, low));
 
   if (integer_zerop (low))
     {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4787bccf5b39a1f883eda3bb207674459f468de3..61d87257fef22c4d9fa892d8515e42fe9c9cf5b2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-15  Andrew Pinski  <pinskia@physics.uc.edu>
+
+	PR middle-end/22398
+	* gcc.c-torture/compile/pr22398.c: New test.
+
 2005-07-15  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/22132
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr22398.c b/gcc/testsuite/gcc.c-torture/compile/pr22398.c
new file mode 100644
index 0000000000000000000000000000000000000000..448de5712cdcc36d944f74d1839862aff583e479
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr22398.c
@@ -0,0 +1,21 @@
+#if ULONG_MAX != 4294967295u && ULONG_MAX != 18446744073709551615ull
+int main(void) { exit (0); }
+#else
+#if ULONG_MAX != 18446744073709551615ull
+#define NUM 0xf0000000
+#else
+#define NUM 0xf000000000000000
+#endif
+
+
+int func1(void *rw)
+{
+  return (rw && (((unsigned long) rw) >= NUM) );
+}
+
+void func2(void *rw)
+{
+  while(rw && (((unsigned long) rw) >= NUM) ) {}
+}
+
+#endif