tree.c (tree_int_cst_lt): Compare constants whose types differ in unsigned-ness corre...

* tree.c (tree_int_cst_lt): Compare constants whose types differ
in unsigned-ness correctly.

From-SVN: r52802

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c87842e..f23a4a4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-26  Alexandre Oliva  <aoliva@redhat.com>
+
+       * tree.c (tree_int_cst_lt): Compare constants whose types differ
+       in unsigned-ness correctly.
+
 2002-04-26  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
        * pa.h (FUNCTION_OK_FOR_SIBCALL): Don't do sibcalls when using the

diff --git a/gcc/tree.c b/gcc/tree.c
index 450dd19..4ec4bd0 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -3230,7 +3230,20 @@ tree_int_cst_lt (t1, t2)
   if (t1 == t2)
     return 0;
 
-  if (! TREE_UNSIGNED (TREE_TYPE (t1)))
+  if (TREE_UNSIGNED (TREE_TYPE (t1)) != TREE_UNSIGNED (TREE_TYPE (t2)))
+    {
+      int t1_sgn = tree_int_cst_sgn (t1);
+      int t2_sgn = tree_int_cst_sgn (t2);
+
+      if (t1_sgn < t2_sgn)
+       return 1;
+      else if (t1_sgn > t2_sgn)
+       return 0;
+      /* Otherwise, both are non-negative, so we compare them as
+        unsigned just in case one of them would overflow a signed
+        type.  */
+    }
+  else if (! TREE_UNSIGNED (TREE_TYPE (t1)))
     return INT_CST_LT (t1, t2);
 
   return INT_CST_LT_UNSIGNED (t1, t2);