Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 032e0b1322 into 3db7bf2d18

Browse source
This commit is contained in:
Ken Jin 2025-12-08 09:28:57 +04:00 • committed by GitHub
commit b0c87bf870
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/test/test_capi/test_opt.py
View file

@ -2695,6 +2695,28 @@ def recursive_wrapper_4569():
pass pass
""")) """))
def test_attribute_changes_are_watched(self):
# Just running to make sure it doesn't crash.
script_helper.assert_python_ok("-c", textwrap.dedent("""
from concurrent.futures import ThreadPoolExecutor
from unittest import TestCase
NTHREADS = 6
BOTTOM = 0
TOP = 1250000
class A:
attr = 10**1000
class TestType(TestCase):
def read(id0):
for _ in range(BOTTOM, TOP):
A.attr
def write(id0):
x = A.attr
x += 1
A.attr = x
with ThreadPoolExecutor(NTHREADS) as pool:
pool.submit(read, (1,))
pool.submit(write, (1,))
"""))
def global_identity(x): def global_identity(x):
return x return x

1
Misc/NEWS.d/next/Core_and_Builtins/2025-12-05-14-33-54.gh-issue-142276.H4j8hP.rst Normal file
View file

@ -0,0 +1 @@
Fix missing type watcher when promoting attribute loads to constants in the JIT. Patch by Ken Jin. Reproducer by Yuancheng Jiang.

4
Python/optimizer_analysis.c
View file

@ -242,7 +242,7 @@ eliminate_pop_guard(_PyUOpInstruction *this_instr, bool exit)
} }
static JitOptRef static JitOptRef
lookup_attr(JitOptContext *ctx, _PyUOpInstruction *this_instr, lookup_attr(JitOptContext *ctx, _PyBloomFilter *dependencies, _PyUOpInstruction *this_instr,
PyTypeObject *type, PyObject *name, uint16_t immortal, PyTypeObject *type, PyObject *name, uint16_t immortal,
uint16_t mortal) uint16_t mortal)
{ {
@ -252,6 +252,8 @@ lookup_attr(JitOptContext *ctx, _PyUOpInstruction *this_instr,
if (lookup) { if (lookup) {
int opcode = _Py_IsImmortal(lookup) ? immortal : mortal; int opcode = _Py_IsImmortal(lookup) ? immortal : mortal;
REPLACE_OP(this_instr, opcode, 0, (uintptr_t)lookup); REPLACE_OP(this_instr, opcode, 0, (uintptr_t)lookup);
PyType_Watch(TYPE_WATCHER_ID, (PyObject *)type);
_Py_BloomFilter_Add(dependencies, type);
return sym_new_const(ctx, lookup); return sym_new_const(ctx, lookup);
} }
} }

12
Python/optimizer_bytecodes.c
View file

@ -607,7 +607,7 @@ dummy_func(void) {
(void)descr; (void)descr;
PyTypeObject *type = (PyTypeObject *)sym_get_const(ctx, owner); PyTypeObject *type = (PyTypeObject *)sym_get_const(ctx, owner);
PyObject *name = get_co_name(ctx, oparg >> 1); PyObject *name = get_co_name(ctx, oparg >> 1);
attr = lookup_attr(ctx, this_instr, type, name, attr = lookup_attr(ctx, dependencies, this_instr, type, name,
_POP_TOP_LOAD_CONST_INLINE_BORROW, _POP_TOP_LOAD_CONST_INLINE_BORROW,
_POP_TOP_LOAD_CONST_INLINE); _POP_TOP_LOAD_CONST_INLINE);
} }
@ -616,7 +616,7 @@ dummy_func(void) {
(void)descr; (void)descr;
PyTypeObject *type = sym_get_type(owner); PyTypeObject *type = sym_get_type(owner);
PyObject *name = get_co_name(ctx, oparg >> 1); PyObject *name = get_co_name(ctx, oparg >> 1);
attr = lookup_attr(ctx, this_instr, type, name, attr = lookup_attr(ctx, dependencies, this_instr, type, name,
_POP_TOP_LOAD_CONST_INLINE_BORROW, _POP_TOP_LOAD_CONST_INLINE_BORROW,
_POP_TOP_LOAD_CONST_INLINE); _POP_TOP_LOAD_CONST_INLINE);
} }
@ -625,7 +625,7 @@ dummy_func(void) {
(void)descr; (void)descr;
PyTypeObject *type = sym_get_type(owner); PyTypeObject *type = sym_get_type(owner);
PyObject *name = get_co_name(ctx, oparg >> 1); PyObject *name = get_co_name(ctx, oparg >> 1);
attr = lookup_attr(ctx, this_instr, type, name, attr = lookup_attr(ctx, dependencies, this_instr, type, name,
_POP_TOP_LOAD_CONST_INLINE_BORROW, _POP_TOP_LOAD_CONST_INLINE_BORROW,
_POP_TOP_LOAD_CONST_INLINE); _POP_TOP_LOAD_CONST_INLINE);
} }
@ -634,7 +634,7 @@ dummy_func(void) {
(void)descr; (void)descr;
PyTypeObject *type = sym_get_type(owner); PyTypeObject *type = sym_get_type(owner);
PyObject *name = get_co_name(ctx, oparg >> 1); PyObject *name = get_co_name(ctx, oparg >> 1);
attr = lookup_attr(ctx, this_instr, type, name, attr = lookup_attr(ctx, dependencies, this_instr, type, name,
_LOAD_CONST_UNDER_INLINE_BORROW, _LOAD_CONST_UNDER_INLINE_BORROW,
_LOAD_CONST_UNDER_INLINE); _LOAD_CONST_UNDER_INLINE);
self = owner; self = owner;
@ -644,7 +644,7 @@ dummy_func(void) {
(void)descr; (void)descr;
PyTypeObject *type = sym_get_type(owner); PyTypeObject *type = sym_get_type(owner);
PyObject *name = get_co_name(ctx, oparg >> 1); PyObject *name = get_co_name(ctx, oparg >> 1);
attr = lookup_attr(ctx, this_instr, type, name, attr = lookup_attr(ctx, dependencies, this_instr, type, name,
_LOAD_CONST_UNDER_INLINE_BORROW, _LOAD_CONST_UNDER_INLINE_BORROW,
_LOAD_CONST_UNDER_INLINE); _LOAD_CONST_UNDER_INLINE);
self = owner; self = owner;
@ -654,7 +654,7 @@ dummy_func(void) {
(void)descr; (void)descr;
PyTypeObject *type = sym_get_type(owner); PyTypeObject *type = sym_get_type(owner);
PyObject *name = get_co_name(ctx, oparg >> 1); PyObject *name = get_co_name(ctx, oparg >> 1);
attr = lookup_attr(ctx, this_instr, type, name, attr = lookup_attr(ctx, dependencies, this_instr, type, name,
_LOAD_CONST_UNDER_INLINE_BORROW, _LOAD_CONST_UNDER_INLINE_BORROW,
_LOAD_CONST_UNDER_INLINE); _LOAD_CONST_UNDER_INLINE);
self = owner; self = owner;

12
Python/optimizer_cases.c.h generated
View file

@ -1848,7 +1848,7 @@
(void)descr; (void)descr;
PyTypeObject *type = (PyTypeObject *)sym_get_const(ctx, owner); PyTypeObject *type = (PyTypeObject *)sym_get_const(ctx, owner);
PyObject *name = get_co_name(ctx, oparg >> 1); PyObject *name = get_co_name(ctx, oparg >> 1);
attr = lookup_attr(ctx, this_instr, type, name, attr = lookup_attr(ctx, dependencies, this_instr, type, name,
_POP_TOP_LOAD_CONST_INLINE_BORROW, _POP_TOP_LOAD_CONST_INLINE_BORROW,
_POP_TOP_LOAD_CONST_INLINE); _POP_TOP_LOAD_CONST_INLINE);
stack_pointer[-1] = attr; stack_pointer[-1] = attr;
@ -2495,7 +2495,7 @@
(void)descr; (void)descr;
PyTypeObject *type = sym_get_type(owner); PyTypeObject *type = sym_get_type(owner);
PyObject *name = get_co_name(ctx, oparg >> 1); PyObject *name = get_co_name(ctx, oparg >> 1);
attr = lookup_attr(ctx, this_instr, type, name, attr = lookup_attr(ctx, dependencies, this_instr, type, name,
_LOAD_CONST_UNDER_INLINE_BORROW, _LOAD_CONST_UNDER_INLINE_BORROW,
_LOAD_CONST_UNDER_INLINE); _LOAD_CONST_UNDER_INLINE);
self = owner; self = owner;
@ -2516,7 +2516,7 @@
(void)descr; (void)descr;
PyTypeObject *type = sym_get_type(owner); PyTypeObject *type = sym_get_type(owner);
PyObject *name = get_co_name(ctx, oparg >> 1); PyObject *name = get_co_name(ctx, oparg >> 1);
attr = lookup_attr(ctx, this_instr, type, name, attr = lookup_attr(ctx, dependencies, this_instr, type, name,
_LOAD_CONST_UNDER_INLINE_BORROW, _LOAD_CONST_UNDER_INLINE_BORROW,
_LOAD_CONST_UNDER_INLINE); _LOAD_CONST_UNDER_INLINE);
self = owner; self = owner;
@ -2536,7 +2536,7 @@
(void)descr; (void)descr;
PyTypeObject *type = sym_get_type(owner); PyTypeObject *type = sym_get_type(owner);
PyObject *name = get_co_name(ctx, oparg >> 1); PyObject *name = get_co_name(ctx, oparg >> 1);
attr = lookup_attr(ctx, this_instr, type, name, attr = lookup_attr(ctx, dependencies, this_instr, type, name,
_POP_TOP_LOAD_CONST_INLINE_BORROW, _POP_TOP_LOAD_CONST_INLINE_BORROW,
_POP_TOP_LOAD_CONST_INLINE); _POP_TOP_LOAD_CONST_INLINE);
stack_pointer[-1] = attr; stack_pointer[-1] = attr;
@ -2551,7 +2551,7 @@
(void)descr; (void)descr;
PyTypeObject *type = sym_get_type(owner); PyTypeObject *type = sym_get_type(owner);
PyObject *name = get_co_name(ctx, oparg >> 1); PyObject *name = get_co_name(ctx, oparg >> 1);
attr = lookup_attr(ctx, this_instr, type, name, attr = lookup_attr(ctx, dependencies, this_instr, type, name,
_POP_TOP_LOAD_CONST_INLINE_BORROW, _POP_TOP_LOAD_CONST_INLINE_BORROW,
_POP_TOP_LOAD_CONST_INLINE); _POP_TOP_LOAD_CONST_INLINE);
stack_pointer[-1] = attr; stack_pointer[-1] = attr;
@ -2571,7 +2571,7 @@
(void)descr; (void)descr;
PyTypeObject *type = sym_get_type(owner); PyTypeObject *type = sym_get_type(owner);
PyObject *name = get_co_name(ctx, oparg >> 1); PyObject *name = get_co_name(ctx, oparg >> 1);
attr = lookup_attr(ctx, this_instr, type, name, attr = lookup_attr(ctx, dependencies, this_instr, type, name,
_LOAD_CONST_UNDER_INLINE_BORROW, _LOAD_CONST_UNDER_INLINE_BORROW,
_LOAD_CONST_UNDER_INLINE); _LOAD_CONST_UNDER_INLINE);
self = owner; self = owner;