Skip to content

Commit f3015c6

Browse files
committed
Merge branch 'immortal' of https://github.com/BobTheBuidler/mypy into immortal
2 parents 5cd8176 + 5b733f3 commit f3015c6

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

mypyc/irbuild/builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ def debug_print(self, toprint: str | Value) -> None:
428428
def set_immortal_if_free_threaded(self, v: Value, line: int) -> None:
429429
"""Make an object immortal on free-threaded builds (to avoid contention)."""
430430
self.builder.set_immortal_if_free_threaded(v, line)
431-
431+
432432
def set_immortal_if_py312plus(self, v: Value, line: int) -> None:
433433
self.builder.set_immortal_if_py312plus(v, line)
434434

mypyc/irbuild/classdef.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,7 @@ def finalize(self, ir: ClassIR) -> None:
262262
non_ext_class = load_non_ext_class(self.builder, ir, self.non_ext, self.cdef.line)
263263
non_ext_class = load_decorated_class(self.builder, self.cdef, non_ext_class)
264264

265-
# Try to avoid contention when using free threading.
266-
self.builder.builder.set_immortal_if_py312plus(non_ext_class, self.cdef.line)
265+
self.builder.set_immortal_if_py312plus(non_ext_class, self.cdef.line)
267266

268267
# Save the decorated class
269268
self.builder.add(

mypyc/irbuild/ll_builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2491,7 +2491,7 @@ def set_immortal_if_free_threaded(self, v: Value, line: int) -> None:
24912491
"""Make an object immortal on free-threaded builds (to avoid contention)."""
24922492
if IS_FREE_THREADED and sys.version_info >= (3, 14):
24932493
self.primitive_op(set_immortal_op, [v], line)
2494-
2494+
24952495
def set_immortal_if_py312plus(self, v: Value, line: int) -> None:
24962496
"""Emit IR to mark an object as immortal in Python 3.12+ (calls CPy_SetImmortal)."""
24972497
if sys.version_info >= (3, 12):

0 commit comments

Comments
 (0)