Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-07 16:02:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-139393: fix _CALL_LEN JIT tests for tuples (#139394)

Browse source 
Fix a regression introduced in 7ce25edb8f
where `_PY_NSMALLPOSINTS` was changed from 257 to 1025.
This commit is contained in:
Bénédikt Tran 2025-09-28 19:30:44 +02:00 • committed by GitHub
parent 519bc470fc
commit 3779f2b95e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@
_testinternalcapi = import_helper.import_module("_testinternalcapi")
from _testinternalcapi import TIER2_THRESHOLD
from _testinternalcapi import _PY_NSMALLPOSINTS, TIER2_THRESHOLD
#For test of issue 136154
GLOBAL_136154 = 42
@ -2093,6 +2093,10 @@ def testfunc(n):
self.assertNotIn("_GUARD_TOS_INT", uops)
def test_call_len_known_length_small_int(self):
# Make sure that len(t) is optimized for a tuple of length 5.
# See https://github.com/python/cpython/issues/139393.
self.assertGreater(_PY_NSMALLPOSINTS, 5)
def testfunc(n):
x = 0
for _ in range(n):
@ -2113,13 +2117,17 @@ def testfunc(n):
self.assertNotIn("_POP_TOP_LOAD_CONST_INLINE_BORROW", uops)
def test_call_len_known_length(self):
# Make sure that len(t) is not optimized for a tuple of length 2048.
# See https://github.com/python/cpython/issues/139393.
self.assertLess(_PY_NSMALLPOSINTS, 2048)
def testfunc(n):
class C:
t = tuple(range(300))
t = tuple(range(2048))
x = 0
for _ in range(n):
if len(C.t) == 300: # comparison + guard removed
if len(C.t) == 2048: # comparison + guard removed
x += 1
return x

5
Modules/_testinternalcapi.c
View file

@ -34,6 +34,7 @@
#include "pycore_pyerrors.h" // _PyErr_ChainExceptions1()
#include "pycore_pylifecycle.h" // _PyInterpreterConfig_InitFromDict()
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_runtime_structs.h" // _PY_NSMALLPOSINTS
#include "pycore_unicodeobject.h" // _PyUnicode_TransformDecimalAndSpaceToASCII()
#include "clinic/_testinternalcapi.c.h"
@ -2576,6 +2577,10 @@ module_exec(PyObject *module)
return 1;
}
if (PyModule_AddIntMacro(module, _PY_NSMALLPOSINTS) < 0) {
return 1;
}
return 0;
}