disabled overlap checks in assert

Author: changhoetyng

mypy/checker.py

@@ -4725,7 +4725,10 @@ def visit_operator_assignment_stmt(self, s: OperatorAssignmentStmt) -> None:
         self.check_final(s)
 
     def visit_assert_stmt(self, s: AssertStmt) -> None:
-        self.expr_checker.accept(s.expr)
+        with self.msg.filter_errors(
+                filter_errors=lambda name, info: info.code == codes.COMPARISON_OVERLAP,
+            ):
+            self.expr_checker.accept(s.expr)
 
         if isinstance(s.expr, TupleExpr) and len(s.expr.items) > 0:
             self.fail(message_registry.MALFORMED_ASSERT, s)
@@ -4735,6 +4738,8 @@ def visit_assert_stmt(self, s: AssertStmt) -> None:
         if s.msg is not None:
             self.expr_checker.analyze_cond_branch(else_map, s.msg, None)
         self.push_type_map(true_map)
+        if not true_map:
+            self.binder.suppress_unreachable_warnings()
 
     def visit_raise_stmt(self, s: RaiseStmt) -> None:
         """Type check a raise statement."""

test-data/unit/check-expressions.test

@@ -2388,7 +2388,7 @@ assert a == b
 
 R2 = Dict[int, R2]
 c: R2
-assert a == c  # E: Non-overlapping equality check (left operand type: "Dict[str, R]", right operand type: "Dict[int, R2]")
+assert a == c
 [builtins fixtures/dict.pyi]
 [typing fixtures/typing-full.pyi]
 

test-data/unit/check-narrowing.test

@@ -727,8 +727,8 @@ def test2(switch: FlipFlopEnum) -> None:
 
     switch.mutate()
 
-    assert switch.state == State.B     # E: Non-overlapping equality check (left operand type: "Literal[State.A]", right operand type: "Literal[State.B]")
-    reveal_type(switch.state)          # E: Statement is unreachable
+    assert switch.state == State.B
+    reveal_type(switch.state)
 
 def test3(switch: FlipFlopEnum) -> None:
     # Same thing, but using 'is' comparisons. Previously mypy's behaviour differed
@@ -739,8 +739,8 @@ def test3(switch: FlipFlopEnum) -> None:
 
     switch.mutate()
 
-    assert switch.state is State.B     # E: Non-overlapping identity check (left operand type: "Literal[State.A]", right operand type: "Literal[State.B]")
-    reveal_type(switch.state)          # E: Statement is unreachable
+    assert switch.state is State.B
+    reveal_type(switch.state)
 [builtins fixtures/primitives.pyi]
 
 [case testNarrowingEqualityRequiresExplicitStrLiteral]

test-data/unit/check-unreachable-code.test

@@ -733,7 +733,7 @@ else:
 def foo(c: int) -> None:
     reveal_type(c)  # N: Revealed type is "builtins.int"
     assert not isinstance(c, int)
-    reveal_type(c)  # E: Statement is unreachable
+    reveal_type(c)
 [builtins fixtures/isinstancelist.pyi]
 
 [case testUnreachableFlagWithBadControlFlow4]
@@ -1338,7 +1338,7 @@ def test_typed_fn(obj) -> None:
     obj.reload()
 
     assert obj.prop is False
-    reveal_type(obj.prop)  # E: Statement is unreachable
+    reveal_type(obj.prop)
 
 [case testUnreachableCheckedUntypedFunction]
 # flags: --warn-unreachable --check-untyped-defs
@@ -1350,7 +1350,7 @@ def test_untyped_fn(obj):
     obj.reload()
 
     assert obj.prop is False
-    reveal_type(obj.prop)  # E: Statement is unreachable
+    reveal_type(obj.prop)
 
 [case testConditionalTypeVarException]
 # every part of this test case was necessary to trigger the crash