[mypyc] Fix unions of bools and ints

mypyc/rt_subtype.py

@@ -51,7 +51,7 @@ def visit_rinstance(self, left: RInstance) -> bool:
         return is_subtype(left, self.right)
 
     def visit_runion(self, left: RUnion) -> bool:
-        return is_subtype(left, self.right)
+        return not self.right.is_unboxed and is_subtype(left, self.right)
 
     def visit_rprimitive(self, left: RPrimitive) -> bool:
         if is_short_int_rprimitive(left) and is_int_rprimitive(self.right):

mypyc/test-data/run-bools.test

@@ -221,3 +221,9 @@ def test_mixed_comparisons_i64() -> None:
             assert neq_mixed_i64(n, x) == (n != int(x))
             assert lt_mixed_i64(x, n) == (int(x) < n)
             assert gt_mixed_i64(n, x) == (n > int(x))
+
+[case testBoolMixInt]
+y = False
+print((y or 0) and True)
+[out]
+0

mypyc/test/test_typeops.py

@@ -54,6 +54,13 @@ def test_bool(self) -> None:
         assert not is_runtime_subtype(bool_rprimitive, bit_rprimitive)
         assert not is_runtime_subtype(bool_rprimitive, int_rprimitive)
 
+    def test_union(self) -> None:
+        bool_int_mix = RUnion([bool_rprimitive, int_rprimitive])
+        assert not is_runtime_subtype(bool_int_mix, short_int_rprimitive)
+        assert not is_runtime_subtype(bool_int_mix, int_rprimitive)
+        assert not is_runtime_subtype(short_int_rprimitive, bool_int_mix)
+        assert not is_runtime_subtype(int_rprimitive, bool_int_mix)
+
 
 class TestUnionSimplification(unittest.TestCase):
     def test_simple_type_result(self) -> None: