Move next_func_version to _PyRuntimeState.

ericsnowcurrently · ericsnowcurrently · commit 51828958b2e0 · 2022-11-14T16:49:31.000-07:00
diff --git a/Include/internal/pycore_function.h b/Include/internal/pycore_function.h
@@ -8,6 +8,10 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
+struct _py_func_runtime_state {
+    uint32_t next_version;
+};
+
 extern PyFunctionObject* _PyFunction_FromConstructor(PyFrameConstructor *constr);
 
 extern uint32_t _PyFunction_GetVersionForCurrentState(PyFunctionObject *func);
diff --git a/Include/internal/pycore_runtime.h b/Include/internal/pycore_runtime.h
@@ -10,6 +10,7 @@ extern "C" {
 
 #include "pycore_atomic.h"          /* _Py_atomic_address */
 #include "pycore_dict_state.h"      // struct _Py_dict_runtime_state
+#include "pycore_function.h"        // struct _func_runtime_state
 #include "pycore_gil.h"             // struct _gil_runtime_state
 #include "pycore_global_objects.h"  // struct _Py_global_objects
 #include "pycore_import.h"          // struct _import_runtime_state
@@ -137,6 +138,7 @@ typedef struct pyruntimestate {
 
     struct _Py_unicode_runtime_ids unicode_ids;
     struct _Py_dict_runtime_state dict_state;
+    struct _py_func_runtime_state func_state;
 
     struct {
         /* Used to set PyTypeObject.tp_version_tag */
diff --git a/Include/internal/pycore_runtime_init.h b/Include/internal/pycore_runtime_init.h
@@ -39,6 +39,9 @@ extern "C" {
         .dict_state = { \
             .next_keys_version = 2, \
         }, \
+        .func_state = { \
+            .next_version = 1, \
+        }, \
         .types = { \
             .next_version_tag = 1, \
         }, \
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
@@ -7,8 +7,6 @@
 #include "pycore_pyerrors.h"      // _PyErr_Occurred()
 #include "structmember.h"         // PyMemberDef
 
-static uint32_t next_func_version = 1;
-
 PyFunctionObject *
 _PyFunction_FromConstructor(PyFrameConstructor *constr)
 {
@@ -130,10 +128,10 @@ uint32_t _PyFunction_GetVersionForCurrentState(PyFunctionObject *func)
     if (func->vectorcall != _PyFunction_Vectorcall) {
         return 0;
     }
-    if (next_func_version == 0) {
+    if (_PyRuntime.func_state.next_version == 0) {
         return 0;
     }
-    uint32_t v = next_func_version++;
+    uint32_t v = _PyRuntime.func_state.next_version++;
     func->func_version = v;
     return v;
 }
diff --git a/Tools/c-analyzer/cpython/globals-to-fix.tsv b/Tools/c-analyzer/cpython/globals-to-fix.tsv
@@ -416,7 +416,6 @@ Python/dtoa.c	-	pmem_next	-
 Python/getargs.c	-	static_arg_parsers	-
 
 # other
-Objects/funcobject.c	-	next_func_version	-
 Objects/object.c	-	_Py_RefTotal	-
 Python/perf_trampoline.c	-	perf_status	-
 Python/perf_trampoline.c	-	extra_code_index	-

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,6 @@`
`7`	`7`	`#include "pycore_pyerrors.h" // _PyErr_Occurred()`
`8`	`8`	`#include "structmember.h" // PyMemberDef`
`9`	`9`
`10`		`-static uint32_t next_func_version = 1;`
`11`		`-`
`12`	`10`	`PyFunctionObject *`
`13`	`11`	`_PyFunction_FromConstructor(PyFrameConstructor *constr)`
`14`	`12`	`{`
`@@ -130,10 +128,10 @@ uint32_t _PyFunction_GetVersionForCurrentState(PyFunctionObject *func)`
`130`	`128`	`if (func->vectorcall != _PyFunction_Vectorcall) {`
`131`	`129`	`return 0;`
`132`	`130`	`}`
`133`		`- if (next_func_version == 0) {`
	`131`	`+ if (_PyRuntime.func_state.next_version == 0) {`
`134`	`132`	`return 0;`
`135`	`133`	`}`
`136`		`- uint32_t v = next_func_version++;`
	`134`	`+ uint32_t v = _PyRuntime.func_state.next_version++;`
`137`	`135`	`func->func_version = v;`
`138`	`136`	`return v;`
`139`	`137`	`}`