gh-144991: Use runtime JIT threshold in _testinternalcapi (gh-145496)

corona10 · web-flow · commit 8b5431367042 · 2026-03-05T09:07:47.000+09:00
diff --git a/Include/internal/pycore_interp_structs.h b/Include/internal/pycore_interp_structs.h
@@ -496,7 +496,7 @@ struct _py_func_state {
 
 /* For now we hard-code this to a value for which we are confident
    all the static builtin types will fit (for all builds). */
-#define _Py_MAX_MANAGED_STATIC_BUILTIN_TYPES 201
+#define _Py_MAX_MANAGED_STATIC_BUILTIN_TYPES 202
 #define _Py_MAX_MANAGED_STATIC_EXT_TYPES 10
 #define _Py_MAX_MANAGED_STATIC_TYPES \
     (_Py_MAX_MANAGED_STATIC_BUILTIN_TYPES + _Py_MAX_MANAGED_STATIC_EXT_TYPES)
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
@@ -2970,6 +2970,8 @@ static PyMethodDef module_functions[] = {
 static int
 module_exec(PyObject *module)
 {
+    PyInterpreterState *interp = PyInterpreterState_Get();
+
     if (_PyTestInternalCapi_Init_Lock(module) < 0) {
         return 1;
     }
@@ -3011,9 +3013,10 @@ module_exec(PyObject *module)
         return 1;
     }
 
+    // + 1 more due to one loop spent on tracing.
+    unsigned long threshold = interp->opt_config.jump_backward_initial_value + 2;
     if (PyModule_Add(module, "TIER2_THRESHOLD",
-        // + 1 more due to one loop spent on tracing.
-                        PyLong_FromLong(JUMP_BACKWARD_INITIAL_VALUE + 2)) < 0) {
+                        PyLong_FromUnsignedLong(threshold)) < 0) {
         return 1;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2970,6 +2970,8 @@ static PyMethodDef module_functions[] = {`
`2970`	`2970`	`static int`
`2971`	`2971`	`module_exec(PyObject *module)`
`2972`	`2972`	`{`
	`2973`	`+ PyInterpreterState *interp = PyInterpreterState_Get();`
	`2974`	`+`
`2973`	`2975`	`if (_PyTestInternalCapi_Init_Lock(module) < 0) {`
`2974`	`2976`	`return 1;`
`2975`	`2977`	`}`
`@@ -3011,9 +3013,10 @@ module_exec(PyObject *module)`
`3011`	`3013`	`return 1;`
`3012`	`3014`	`}`
`3013`	`3015`
	`3016`	`+ // + 1 more due to one loop spent on tracing.`
	`3017`	`+ unsigned long threshold = interp->opt_config.jump_backward_initial_value + 2;`
`3014`	`3018`	`if (PyModule_Add(module, "TIER2_THRESHOLD",`
`3015`		`- // + 1 more due to one loop spent on tracing.`
`3016`		`- PyLong_FromLong(JUMP_BACKWARD_INITIAL_VALUE + 2)) < 0) {`
	`3019`	`+ PyLong_FromUnsignedLong(threshold)) < 0) {`
`3017`	`3020`	`return 1;`
`3018`	`3021`	`}`
`3019`	`3022`