diff --git a/mypyc/codegen/emitfunc.py b/mypyc/codegen/emitfunc.py index 14be734866f8..67ad9b75b4da 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, @@ -1187,7 +1189,11 @@ 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)" diff --git a/mypyc/test/test_emitfunc.py b/mypyc/test/test_emitfunc.py index b3cabb67214a..a6c3b2079876 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, @@ -117,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) @@ -1050,6 +1056,14 @@ 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;""", ) + self.assert_emit( + 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(self.i16, self.i16_1, ComparisonOp.ULT, 1), + """cpy_r_r0 = (uint16_t)cpy_r_i16 < (uint16_t)cpy_r_i16_1;""", + ) # object type self.assert_emit( @@ -1233,6 +1247,15 @@ def test_cast_and_branch_no_merge_4(self) -> None: def test_extend(self) -> None: a = Register(int32_rprimitive, "a") + self.assert_emit( + Extend(self.i8, int64_rprimitive, signed=True), """cpy_r_r0 = cpy_r_i8;""" + ) + self.assert_emit( + 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( Extend(a, int64_rprimitive, signed=False), """cpy_r_r0 = (uint32_t)cpy_r_a;"""