mkintcon: bugfix clamp i32 to i32 range

2 files changed, 5 insertions, 3 deletions

diff --git a/src/ir.c b/src/ir.c
index 298f26b..ead9ae4 100644
--- a/src/ir.c
+++ b/src/ir.c
@@ -136,12 +136,14 @@ mkirtype(Type t)
 Ref
 mkintcon(enum irclass k, s64int i)
 {
+   if (cls2siz[k] == 4) { /* check upper half is zero or -1 */
+      assert(in_range((i >> 32) + 1, 0, 1));
+      i = (int)i;
+   }
    if (i < 1l << 28 && i >= -(1l << 28)) {
       return mkref(RICON, i);
    } else {
       IRCon con = { .cls = k, .i = i };
-      if (cls2siz[k] == 4) /* check upper half is zero or -1 */
-         assert(in_range((i >> 32) + 1, 0, 1));
       return newxcon(&con);
    }
 }
diff --git a/src/ir_fold.c b/src/ir_fold.c
index 37edbbc..fcfe88b 100644
--- a/src/ir_fold.c
+++ b/src/ir_fold.c
@@ -67,7 +67,7 @@ foldint(enum op op, enum irclass k, Ref lr, Ref rr)
    case Ougte: x = l.u >= r.u; break;
    default: assert(0);
    }
-   if (cls2siz[k] < 8) x = (int)x;
+   if (!w) x = (int)x;
    return mkintcon(k, x);
 }