Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 14:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-138431: JIT Optimizer --- Fix round-tripping references for str and tuple (GH-138458)

Browse source 
Co-authored-by: Mark Shannon <9448417+markshannon@users.noreply.github.com>
This commit is contained in:
Ken Jin 2025-09-04 02:05:06 +08:00 • committed by GitHub
parent 0d1f4e1639
commit 2402f84665
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Include/internal/pycore_optimizer.h
View file

@ -251,6 +251,12 @@ PyJitRef_Wrap(JitOptSymbol *sym)
return (JitOptRef){.bits=(uintptr_t)sym};
}
static inline JitOptRef
PyJitRef_StripReferenceInfo(JitOptRef ref)
{
return PyJitRef_Wrap(PyJitRef_Unwrap(ref));
}
static inline JitOptRef
PyJitRef_Borrow(JitOptRef ref)
{

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

@ -2501,6 +2501,22 @@ def testfunc(n):
# For now... until we constant propagate it away.
self.assertIn("_BINARY_OP", uops)
def test_reference_tracking_across_call_doesnt_crash(self):
def f1():
for _ in range(TIER2_THRESHOLD + 1):
# Choose a value that won't occur elsewhere to avoid sharing
str("value that won't occur elsewhere to avoid sharing")
f1()
def f2():
for _ in range(TIER2_THRESHOLD + 1):
# Choose a value that won't occur elsewhere to avoid sharing
tuple((31, -17, 25, "won't occur elsewhere"))
f2()
def global_identity(x):
return x

1
Misc/NEWS.d/next/Core_and_Builtins/2025-09-03-15-35-34.gh-issue-138431.EUsrtA.rst Normal file
View file

@ -0,0 +1 @@
Fix a bug in the JIT optimizer when round-tripping strings and tuples.

13
Python/optimizer_bytecodes.c
View file

@ -762,9 +762,8 @@ dummy_func(void) {
}
op(_RETURN_VALUE, (retval -- res)) {
// We wrap and unwrap the value to mimic PyStackRef_MakeHeapSafe
// in bytecodes.c
JitOptRef temp = PyJitRef_Wrap(PyJitRef_Unwrap(retval));
// Mimics PyStackRef_MakeHeapSafe in the interpreter.
JitOptRef temp = PyJitRef_StripReferenceInfo(retval);
DEAD(retval);
SAVE_STACK();
ctx->frame->stack_pointer = stack_pointer;
@ -925,7 +924,9 @@ dummy_func(void) {
op(_CALL_STR_1, (unused, unused, arg -- res)) {
if (sym_matches_type(arg, &PyUnicode_Type)) {
// e.g. str('foo') or str(foo) where foo is known to be a string
res = arg;
// Note: we must strip the reference information because it goes
// through str() which strips the reference information from it.
res = PyJitRef_StripReferenceInfo(arg);
}
else {
res = sym_new_type(ctx, &PyUnicode_Type);
@ -1065,7 +1066,9 @@ dummy_func(void) {
op(_CALL_TUPLE_1, (callable, null, arg -- res)) {
if (sym_matches_type(arg, &PyTuple_Type)) {
// e.g. tuple((1, 2)) or tuple(foo) where foo is known to be a tuple
res = arg;
// Note: we must strip the reference information because it goes
// through tuple() which strips the reference information from it.
res = PyJitRef_StripReferenceInfo(arg);
}
else {
res = sym_new_type(ctx, &PyTuple_Type);

6
Python/optimizer_cases.c.h generated
View file

@ -1060,7 +1060,7 @@
JitOptRef retval;
JitOptRef res;
retval = stack_pointer[-1];
JitOptRef temp = PyJitRef_Wrap(PyJitRef_Unwrap(retval));
JitOptRef temp = PyJitRef_StripReferenceInfo(retval);
stack_pointer += -1;
assert(WITHIN_STACK_BOUNDS());
ctx->frame->stack_pointer = stack_pointer;
@ -2496,7 +2496,7 @@
JitOptRef res;
arg = stack_pointer[-1];
if (sym_matches_type(arg, &PyUnicode_Type)) {
res = arg;
res = PyJitRef_StripReferenceInfo(arg);
}
else {
res = sym_new_type(ctx, &PyUnicode_Type);
@ -2522,7 +2522,7 @@
JitOptRef res;
arg = stack_pointer[-1];
if (sym_matches_type(arg, &PyTuple_Type)) {
res = arg;
res = PyJitRef_StripReferenceInfo(arg);
}
else {
res = sym_new_type(ctx, &PyTuple_Type);