Merge remote-tracking branch 'upstream/master' into simplify-indirect

ilevkivskyi · ilevkivskyi · commit ff981eb7eb53 · 2025-09-06T12:15:58.000+01:00
diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py
@@ -6435,7 +6435,7 @@ def visit_type_var(self, t: TypeVarType) -> bool:
 
     def visit_param_spec(self, t: ParamSpecType) -> bool:
         default = [t.default] if t.has_default() else []
-        return self.query_types([t.upper_bound, *default])
+        return self.query_types([t.upper_bound, *default, t.prefix])
 
     def visit_type_var_tuple(self, t: TypeVarTupleType) -> bool:
         default = [t.default] if t.has_default() else []
diff --git a/mypy/erasetype.py b/mypy/erasetype.py
@@ -222,6 +222,7 @@ def visit_type_var_tuple(self, t: TypeVarTupleType) -> Type:
         return t
 
     def visit_param_spec(self, t: ParamSpecType) -> Type:
+        # TODO: we should probably preserve prefix here.
         if self.erase_id is None or self.erase_id(t.id):
             return self.replacement
         return t
diff --git a/mypy/fixup.py b/mypy/fixup.py
@@ -347,6 +347,7 @@ def visit_type_var(self, tvt: TypeVarType) -> None:
     def visit_param_spec(self, p: ParamSpecType) -> None:
         p.upper_bound.accept(self)
         p.default.accept(self)
+        p.prefix.accept(self)
 
     def visit_type_var_tuple(self, t: TypeVarTupleType) -> None:
         t.tuple_fallback.accept(self)
diff --git a/mypy/indirection.py b/mypy/indirection.py
@@ -107,6 +107,7 @@ def visit_type_var(self, t: types.TypeVarType) -> None:
     def visit_param_spec(self, t: types.ParamSpecType) -> None:
         self._visit(t.upper_bound)
         self._visit(t.default)
+        self._visit(t.prefix)
 
     def visit_type_var_tuple(self, t: types.TypeVarTupleType) -> None:
         self._visit(t.upper_bound)
diff --git a/mypy/main.py b/mypy/main.py
@@ -886,7 +886,7 @@ def add_invertible_flag(
         "--allow-redefinition-new",
         default=False,
         strict_flag=False,
-        help=argparse.SUPPRESS,  # This is still very experimental
+        help="Allow more flexible variable redefinition semantics (experimental)",
         group=strictness_group,
     )
 
diff --git a/mypy/options.py b/mypy/options.py
@@ -74,6 +74,7 @@ class BuildType:
         "disable_memoryview_promotion",
         "strict_bytes",
         "fixed_format_cache",
+        "untyped_calls_exclude",
     }
 ) - {"debug_cache"}
 
diff --git a/mypy/server/astdiff.py b/mypy/server/astdiff.py
@@ -435,6 +435,7 @@ def visit_param_spec(self, typ: ParamSpecType) -> SnapshotItem:
             typ.flavor,
             snapshot_type(typ.upper_bound),
             snapshot_type(typ.default),
+            snapshot_type(typ.prefix),
         )
 
     def visit_type_var_tuple(self, typ: TypeVarTupleType) -> SnapshotItem:
diff --git a/mypy/server/astmerge.py b/mypy/server/astmerge.py
@@ -489,6 +489,7 @@ def visit_type_var(self, typ: TypeVarType) -> None:
     def visit_param_spec(self, typ: ParamSpecType) -> None:
         typ.upper_bound.accept(self)
         typ.default.accept(self)
+        typ.prefix.accept(self)
 
     def visit_type_var_tuple(self, typ: TypeVarTupleType) -> None:
         typ.upper_bound.accept(self)
diff --git a/mypy/server/deps.py b/mypy/server/deps.py
@@ -1038,10 +1038,8 @@ def visit_type_var(self, typ: TypeVarType) -> list[str]:
         triggers = []
         if typ.fullname:
             triggers.append(make_trigger(typ.fullname))
-        if typ.upper_bound:
-            triggers.extend(self.get_type_triggers(typ.upper_bound))
-        if typ.default:
-            triggers.extend(self.get_type_triggers(typ.default))
+        triggers.extend(self.get_type_triggers(typ.upper_bound))
+        triggers.extend(self.get_type_triggers(typ.default))
         for val in typ.values:
             triggers.extend(self.get_type_triggers(val))
         return triggers
@@ -1050,22 +1048,17 @@ def visit_param_spec(self, typ: ParamSpecType) -> list[str]:
         triggers = []
         if typ.fullname:
             triggers.append(make_trigger(typ.fullname))
-        if typ.upper_bound:
-            triggers.extend(self.get_type_triggers(typ.upper_bound))
-        if typ.default:
-            triggers.extend(self.get_type_triggers(typ.default))
         triggers.extend(self.get_type_triggers(typ.upper_bound))
+        triggers.extend(self.get_type_triggers(typ.default))
+        triggers.extend(self.get_type_triggers(typ.prefix))
         return triggers
 
     def visit_type_var_tuple(self, typ: TypeVarTupleType) -> list[str]:
         triggers = []
         if typ.fullname:
             triggers.append(make_trigger(typ.fullname))
-        if typ.upper_bound:
-            triggers.extend(self.get_type_triggers(typ.upper_bound))
-        if typ.default:
-            triggers.extend(self.get_type_triggers(typ.default))
         triggers.extend(self.get_type_triggers(typ.upper_bound))
+        triggers.extend(self.get_type_triggers(typ.default))
         return triggers
 
     def visit_unpack_type(self, typ: UnpackType) -> list[str]:
diff --git a/mypy/stubtest.py b/mypy/stubtest.py
@@ -140,6 +140,11 @@ def is_positional_only_related(self) -> bool:
         # TODO: This is hacky, use error codes or something more resilient
         return "should be positional" in self.message
 
+    def is_disjoint_base_related(self) -> bool:
+        """Whether or not the error is related to @disjoint_base."""
+        # TODO: This is hacky, use error codes or something more resilient
+        return "@disjoint_base" in self.message
+
     def get_description(self, concise: bool = False) -> str:
         """Returns a description of the error.
 
@@ -2181,6 +2186,7 @@ class _Arguments:
     concise: bool
     ignore_missing_stub: bool
     ignore_positional_only: bool
+    ignore_disjoint_bases: bool
     allowlist: list[str]
     generate_allowlist: bool
     ignore_unused_allowlist: bool
@@ -2274,6 +2280,8 @@ def warning_callback(msg: str) -> None:
                 continue
             if args.ignore_positional_only and error.is_positional_only_related():
                 continue
+            if args.ignore_disjoint_bases and error.is_disjoint_base_related():
+                continue
             if error.object_desc in allowlist:
                 allowlist[error.object_desc] = True
                 continue
@@ -2364,6 +2372,12 @@ def parse_options(args: list[str]) -> _Arguments:
         action="store_true",
         help="Ignore errors for whether an argument should or shouldn't be positional-only",
     )
+    # TODO: Remove once PEP 800 is accepted
+    parser.add_argument(
+        "--ignore-disjoint-bases",
+        action="store_true",
+        help="Disable checks for PEP 800 @disjoint_base classes",
+    )
     parser.add_argument(
         "--allowlist",
         "--whitelist",
diff --git a/mypy/type_visitor.py b/mypy/type_visitor.py
@@ -525,7 +525,7 @@ def visit_type_var(self, t: TypeVarType, /) -> bool:
         return self.query_types([t.upper_bound, t.default] + t.values)
 
     def visit_param_spec(self, t: ParamSpecType, /) -> bool:
-        return self.query_types([t.upper_bound, t.default])
+        return self.query_types([t.upper_bound, t.default, t.prefix])
 
     def visit_type_var_tuple(self, t: TypeVarTupleType, /) -> bool:
         return self.query_types([t.upper_bound, t.default])
diff --git a/mypy/typeanal.py b/mypy/typeanal.py
@@ -2616,7 +2616,7 @@ def visit_type_var(self, t: TypeVarType) -> None:
         self.process_types([t.upper_bound, t.default] + t.values)
 
     def visit_param_spec(self, t: ParamSpecType) -> None:
-        self.process_types([t.upper_bound, t.default])
+        self.process_types([t.upper_bound, t.default, t.prefix])
 
     def visit_type_var_tuple(self, t: TypeVarTupleType) -> None:
         self.process_types([t.upper_bound, t.default])
diff --git a/mypy/typetraverser.py b/mypy/typetraverser.py
@@ -64,6 +64,7 @@ def visit_type_var(self, t: TypeVarType, /) -> None:
         t.default.accept(self)
 
     def visit_param_spec(self, t: ParamSpecType, /) -> None:
+        # TODO: do we need to traverse prefix here?
         t.default.accept(self)
 
     def visit_parameters(self, t: Parameters, /) -> None:
diff --git a/mypy/version.py b/mypy/version.py
@@ -8,7 +8,7 @@
 # - Release versions have the form "1.2.3".
 # - Dev versions have the form "1.2.3+dev" (PLUS sign to conform to PEP 440).
 # - Before 1.0 we had the form "0.NNN".
-__version__ = "1.18.0+dev"
+__version__ = "1.19.0+dev"
 base_version = __version__
 
 mypy_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
diff --git a/mypyc/analysis/attrdefined.py b/mypyc/analysis/attrdefined.py
@@ -422,7 +422,7 @@ def detect_undefined_bitmap(cl: ClassIR, seen: set[ClassIR]) -> None:
         return
     seen.add(cl)
     for base in cl.base_mro[1:]:
-        detect_undefined_bitmap(cl, seen)
+        detect_undefined_bitmap(base, seen)
 
     if len(cl.base_mro) > 1:
         cl.bitmap_attrs.extend(cl.base_mro[1].bitmap_attrs)
diff --git a/mypyc/codegen/emitclass.py b/mypyc/codegen/emitclass.py
@@ -205,10 +205,6 @@ def generate_class_reuse(
     TODO: Generalize to support a free list with up to N objects.
     """
     assert cl.reuse_freed_instance
-
-    # The free list implementation doesn't support class hierarchies
-    assert cl.is_final_class or cl.children == []
-
     context = c_emitter.context
     name = cl.name_prefix(c_emitter.names) + "_free_instance"
     struct_name = cl.struct_name(c_emitter.names)
diff --git a/mypyc/irbuild/prepare.py b/mypyc/irbuild/prepare.py
@@ -363,6 +363,12 @@ def prepare_class_def(
         line = attrs_lines["free_list_len"]
         if ir.is_trait:
             errors.error('"free_list_len" can\'t be used with traits', path, line)
+        if ir.allow_interpreted_subclasses:
+            errors.error(
+                '"free_list_len" can\'t be used in a class that allows interpreted subclasses',
+                path,
+                line,
+            )
         if free_list_len == 1:
             ir.reuse_freed_instance = True
         else:
diff --git a/mypyc/primitives/weakref_ops.py b/mypyc/primitives/weakref_ops.py
@@ -20,3 +20,21 @@
     c_function_name="PyWeakref_NewRef",
     error_kind=ERR_MAGIC,
 )
+
+new_proxy_op = function_op(
+    name="_weakref.proxy",
+    arg_types=[object_rprimitive],
+    return_type=object_rprimitive,
+    c_function_name="PyWeakref_NewProxy",
+    extra_int_constants=[(0, pointer_rprimitive)],
+    error_kind=ERR_MAGIC,
+)
+
+new_proxy_with_callback_op = function_op(
+    name="_weakref.proxy",
+    arg_types=[object_rprimitive, object_rprimitive],
+    # steals=[True, False],
+    return_type=object_rprimitive,
+    c_function_name="PyWeakref_NewProxy",
+    error_kind=ERR_MAGIC,
+)
diff --git a/mypyc/test-data/fixtures/ir.py b/mypyc/test-data/fixtures/ir.py
@@ -243,7 +243,7 @@ def __add__(self, value: List[_S], /) -> List[_S | _T]: ...
     def __iadd__(self, value: Iterable[_T], /) -> List[_T]: ...  # type: ignore[misc]
     def append(self, x: _T) -> None: pass
     def pop(self, i: int = -1) -> _T: pass
-    def count(self, _T) -> int: pass
+    def count(self, x: _T) -> int: pass
     def extend(self, l: Iterable[_T]) -> None: pass
     def insert(self, i: int, x: _T) -> None: pass
     def sort(self) -> None: pass
@@ -343,6 +343,7 @@ class RuntimeError(Exception): pass
 class UnicodeEncodeError(RuntimeError): pass
 class UnicodeDecodeError(RuntimeError): pass
 class NotImplementedError(RuntimeError): pass
+class ReferenceError(Exception): pass
 
 class StopIteration(Exception):
     value: Any
@@ -365,7 +366,7 @@ def reversed(object: Sequence[_T]) -> Iterator[_T]: ...
 def id(o: object) -> int: pass
 # This type is obviously wrong but the test stubs don't have Sized anymore
 def len(o: object) -> int: pass
-def print(*object) -> None: pass
+def print(*args: object) -> None: pass
 def isinstance(x: object, t: object) -> bool: pass
 def iter(i: Iterable[_T]) -> Iterator[_T]: pass
 @overload
diff --git a/mypyc/test-data/fixtures/typing-full.pyi b/mypyc/test-data/fixtures/typing-full.pyi
@@ -11,10 +11,10 @@ from abc import abstractmethod, ABCMeta
 class GenericMeta(type): pass
 
 class _SpecialForm:
-    def __getitem__(self, index): ...
+    def __getitem__(self, index: Any) -> Any: ...
 class TypeVar:
-    def __init__(self, name, *args, bound=None): ...
-    def __or__(self, other): ...
+    def __init__(self, name: str, *args: Any, bound: Any = None): ...
+    def __or__(self, other: Any) -> Any: ...
 
 cast = 0
 overload = 0
diff --git a/mypyc/test-data/irbuild-classes.test b/mypyc/test-data/irbuild-classes.test
@@ -1754,3 +1754,7 @@ class FreeListError:
 @mypyc_attr(free_list_len=1)  # E: "free_list_len" can't be used with traits
 class NonNative:
     pass
+
+@mypyc_attr(free_list_len=1, allow_interpreted_subclasses=True)  # E: "free_list_len" can't be used in a class that allows interpreted subclasses
+class InterpSub:
+    pass
diff --git a/mypyc/test-data/irbuild-weakref.test b/mypyc/test-data/irbuild-weakref.test
@@ -49,3 +49,55 @@ def f(x, cb):
 L0:
     r0 = PyWeakref_NewRef(x, cb)
     return r0
+
+[case testWeakrefProxy]
+import weakref
+from typing import Any, Callable
+def f(x: object) -> object:
+    return weakref.proxy(x)
+
+[out]
+def f(x):
+    x, r0 :: object
+L0:
+    r0 = PyWeakref_NewProxy(x, 0)
+    return r0
+
+[case testWeakrefProxyCallback]
+import weakref
+from typing import Any, Callable
+def f(x: object, cb: Callable[[object], Any]) -> object:
+    return weakref.proxy(x, cb)
+
+[out]
+def f(x, cb):
+    x, cb, r0 :: object
+L0:
+    r0 = PyWeakref_NewProxy(x, cb)
+    return r0
+
+[case testFromWeakrefProxy]
+from typing import Any, Callable
+from weakref import proxy
+def f(x: object) -> object:
+    return proxy(x)
+
+[out]
+def f(x):
+    x, r0 :: object
+L0:
+    r0 = PyWeakref_NewProxy(x, 0)
+    return r0
+
+[case testFromWeakrefProxyCallback]
+from typing import Any, Callable
+from weakref import proxy
+def f(x: object, cb: Callable[[object], Any]) -> object:
+    return proxy(x, cb)
+
+[out]
+def f(x, cb):
+    x, cb, r0 :: object
+L0:
+    r0 = PyWeakref_NewProxy(x, cb)
+    return r0
diff --git a/mypyc/test-data/run-classes.test b/mypyc/test-data/run-classes.test
diff --git a/mypyc/test-data/run-dunders.test b/mypyc/test-data/run-dunders.test
diff --git a/mypyc/test-data/run-singledispatch.test b/mypyc/test-data/run-singledispatch.test
diff --git a/mypyc/test-data/run-weakref.test b/mypyc/test-data/run-weakref.test
diff --git a/test-data/unit/check-incremental.test b/test-data/unit/check-incremental.test
diff --git a/test-data/unit/fine-grained.test b/test-data/unit/fine-grained.test
diff --git a/test-data/unit/lib-stub/_weakref.pyi b/test-data/unit/lib-stub/_weakref.pyi
diff --git a/test-data/unit/lib-stub/weakref.pyi b/test-data/unit/lib-stub/weakref.pyi

Original file line number	Diff line number	Diff line change
`@@ -886,7 +886,7 @@ def add_invertible_flag(`
`886`	`886`	`"--allow-redefinition-new",`
`887`	`887`	`default=False,`
`888`	`888`	`strict_flag=False,`
`889`		`- help=argparse.SUPPRESS, # This is still very experimental`
	`889`	`+ help="Allow more flexible variable redefinition semantics (experimental)",`
`890`	`890`	`group=strictness_group,`
`891`	`891`	`)`
`892`	`892`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ class BuildType:`
`74`	`74`	`"disable_memoryview_promotion",`
`75`	`75`	`"strict_bytes",`
`76`	`76`	`"fixed_format_cache",`
	`77`	`+ "untyped_calls_exclude",`
`77`	`78`	`}`
`78`	`79`	`) - {"debug_cache"}`
`79`	`80`
Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,7 @@ def visit_param_spec(self, typ: ParamSpecType) -> SnapshotItem:`
`435`	`435`	`typ.flavor,`
`436`	`436`	`snapshot_type(typ.upper_bound),`
`437`	`437`	`snapshot_type(typ.default),`
	`438`	`+ snapshot_type(typ.prefix),`
`438`	`439`	`)`
`439`	`440`
`440`	`441`	`def visit_type_var_tuple(self, typ: TypeVarTupleType) -> SnapshotItem:`