From 20a781df42a03952fddb20f0589567afc6c249fe Mon Sep 17 00:00:00 2001 From: Jahongir Qurbonov Date: Sun, 15 Nov 2026 01:37:44 +0500 Subject: [PATCH 1/2] [mypyc] Emit unsigned casts for i8 and i16 operands emit_unsigned_int_cast only handled 32-bit and 64-bit operands, so an unsigned comparison (ULT etc.) or a zero-extending Extend with an i8 or i16 operand was emitted without a cast. C then compared or extended the value as signed, e.g. an i8 value of -1 extended to 0xffffffffffffffff instead of 0xff, and -1 < 5 was true for an unsigned comparison. The current IR builder doesn't generate such ops, but they are valid IR and easy to produce when adding new native int operations, so cast to uint8_t and uint16_t like we already do for the wider types. --- mypyc/codegen/emitfunc.py | 6 ++++++ mypyc/test/test_emitfunc.py | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/mypyc/codegen/emitfunc.py b/mypyc/codegen/emitfunc.py index 14be734866f8a..b9192e43482aa 100644 --- a/mypyc/codegen/emitfunc.py +++ b/mypyc/codegen/emitfunc.py @@ -85,6 +85,8 @@ RType, RVec, is_bool_or_bit_rprimitive, + is_int8_rprimitive, + is_int16_rprimitive, is_int32_rprimitive, is_int64_rprimitive, is_int_rprimitive, @@ -1191,6 +1193,10 @@ def emit_unsigned_int_cast(self, type: RType) -> str: return "(uint32_t)" elif is_int64_rprimitive(type): return "(uint64_t)" + elif is_int16_rprimitive(type): + return "(uint16_t)" + elif is_int8_rprimitive(type): + return "(uint8_t)" else: return "" diff --git a/mypyc/test/test_emitfunc.py b/mypyc/test/test_emitfunc.py index b3cabb67214a9..aaddb965ff0d0 100644 --- a/mypyc/test/test_emitfunc.py +++ b/mypyc/test/test_emitfunc.py @@ -66,6 +66,8 @@ c_pointer_rprimitive, cstring_rprimitive, dict_rprimitive, + int8_rprimitive, + int16_rprimitive, int32_rprimitive, int64_rprimitive, int_rprimitive, @@ -1050,6 +1052,16 @@ def test_comparison_op(self) -> None: ComparisonOp(self.i64, self.i64_1, ComparisonOp.ULT, 1), """cpy_r_r0 = (uint64_t)cpy_r_i64 < (uint64_t)cpy_r_i64_1;""", ) + i8 = Register(int8_rprimitive, "i8") + i16 = Register(int16_rprimitive, "i16") + self.assert_emit( + ComparisonOp(i8, Integer(5, int8_rprimitive), ComparisonOp.ULT, 1), + """cpy_r_r0 = (uint8_t)cpy_r_i8 < (uint8_t)5;""", + ) + self.assert_emit( + ComparisonOp(i16, Integer(5, int16_rprimitive), ComparisonOp.UGE, 1), + """cpy_r_r0 = (uint16_t)cpy_r_i16 >= (uint16_t)5;""", + ) # object type self.assert_emit( @@ -1233,6 +1245,15 @@ def test_cast_and_branch_no_merge_4(self) -> None: def test_extend(self) -> None: a = Register(int32_rprimitive, "a") + i8 = Register(int8_rprimitive, "i8") + self.assert_emit(Extend(i8, int64_rprimitive, signed=True), """cpy_r_r0 = cpy_r_i8;""") + self.assert_emit( + Extend(i8, int64_rprimitive, signed=False), """cpy_r_r0 = (uint8_t)cpy_r_i8;""" + ) + i16 = Register(int16_rprimitive, "i16") + self.assert_emit( + Extend(i16, int32_rprimitive, signed=False), """cpy_r_r0 = (uint16_t)cpy_r_i16;""" + ) self.assert_emit(Extend(a, int64_rprimitive, signed=True), """cpy_r_r0 = cpy_r_a;""") self.assert_emit( Extend(a, int64_rprimitive, signed=False), """cpy_r_r0 = (uint32_t)cpy_r_a;""" From c50978bfb536fffa881ac665ff6a7c583220bdf1 Mon Sep 17 00:00:00 2001 From: Jahongir Qurbonov Date: Sun, 15 Nov 2026 01:53:53 +0500 Subject: [PATCH 2/2] Order casts by size and use registers from setUp in tests --- mypyc/codegen/emitfunc.py | 10 +++++----- mypyc/test/test_emitfunc.py | 24 +++++++++++++----------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/mypyc/codegen/emitfunc.py b/mypyc/codegen/emitfunc.py index b9192e43482aa..67ad9b75b4da6 100644 --- a/mypyc/codegen/emitfunc.py +++ b/mypyc/codegen/emitfunc.py @@ -1189,14 +1189,14 @@ def emit_signed_int_cast(self, type: RType) -> str: return "" def emit_unsigned_int_cast(self, type: RType) -> str: - if is_int32_rprimitive(type): + if is_int8_rprimitive(type): + return "(uint8_t)" + elif is_int16_rprimitive(type): + return "(uint16_t)" + elif is_int32_rprimitive(type): return "(uint32_t)" elif is_int64_rprimitive(type): return "(uint64_t)" - elif is_int16_rprimitive(type): - return "(uint16_t)" - elif is_int8_rprimitive(type): - return "(uint8_t)" else: return "" diff --git a/mypyc/test/test_emitfunc.py b/mypyc/test/test_emitfunc.py index aaddb965ff0d0..a6c3b20798765 100644 --- a/mypyc/test/test_emitfunc.py +++ b/mypyc/test/test_emitfunc.py @@ -119,6 +119,10 @@ def add_local(name: str, rtype: RType) -> Register: self.b = add_local("b", bool_rprimitive) self.s1 = add_local("s1", short_int_rprimitive) self.s2 = add_local("s2", short_int_rprimitive) + self.i8 = add_local("i8", int8_rprimitive) + self.i8_1 = add_local("i8_1", int8_rprimitive) + self.i16 = add_local("i16", int16_rprimitive) + self.i16_1 = add_local("i16_1", int16_rprimitive) self.i32 = add_local("i32", int32_rprimitive) self.i32_1 = add_local("i32_1", int32_rprimitive) self.i64 = add_local("i64", int64_rprimitive) @@ -1052,15 +1056,13 @@ def test_comparison_op(self) -> None: ComparisonOp(self.i64, self.i64_1, ComparisonOp.ULT, 1), """cpy_r_r0 = (uint64_t)cpy_r_i64 < (uint64_t)cpy_r_i64_1;""", ) - i8 = Register(int8_rprimitive, "i8") - i16 = Register(int16_rprimitive, "i16") self.assert_emit( - ComparisonOp(i8, Integer(5, int8_rprimitive), ComparisonOp.ULT, 1), - """cpy_r_r0 = (uint8_t)cpy_r_i8 < (uint8_t)5;""", + ComparisonOp(self.i8, self.i8_1, ComparisonOp.ULT, 1), + """cpy_r_r0 = (uint8_t)cpy_r_i8 < (uint8_t)cpy_r_i8_1;""", ) self.assert_emit( - ComparisonOp(i16, Integer(5, int16_rprimitive), ComparisonOp.UGE, 1), - """cpy_r_r0 = (uint16_t)cpy_r_i16 >= (uint16_t)5;""", + ComparisonOp(self.i16, self.i16_1, ComparisonOp.ULT, 1), + """cpy_r_r0 = (uint16_t)cpy_r_i16 < (uint16_t)cpy_r_i16_1;""", ) # object type @@ -1245,14 +1247,14 @@ def test_cast_and_branch_no_merge_4(self) -> None: def test_extend(self) -> None: a = Register(int32_rprimitive, "a") - i8 = Register(int8_rprimitive, "i8") - self.assert_emit(Extend(i8, int64_rprimitive, signed=True), """cpy_r_r0 = cpy_r_i8;""") self.assert_emit( - Extend(i8, int64_rprimitive, signed=False), """cpy_r_r0 = (uint8_t)cpy_r_i8;""" + Extend(self.i8, int64_rprimitive, signed=True), """cpy_r_r0 = cpy_r_i8;""" ) - i16 = Register(int16_rprimitive, "i16") self.assert_emit( - Extend(i16, int32_rprimitive, signed=False), """cpy_r_r0 = (uint16_t)cpy_r_i16;""" + Extend(self.i8, int64_rprimitive, signed=False), """cpy_r_r0 = (uint8_t)cpy_r_i8;""" + ) + self.assert_emit( + Extend(self.i16, int32_rprimitive, signed=False), """cpy_r_r0 = (uint16_t)cpy_r_i16;""" ) self.assert_emit(Extend(a, int64_rprimitive, signed=True), """cpy_r_r0 = cpy_r_a;""") self.assert_emit(