Move next_dict_keys_version to _PyRuntimeState.

Author: ericsnowcurrently

Include/internal/pycore_dict.h

@@ -17,6 +17,10 @@ extern void _PyDict_Fini(PyInterpreterState *interp);
 
 /* other API */
 
+struct _Py_dict_runtime_state {
+    uint32_t next_keys_version;
+};
+
 #ifndef WITH_FREELISTS
 // without freelists
 #  define PyDict_MAXFREELIST 0

Include/internal/pycore_runtime.h

@@ -9,6 +9,7 @@ extern "C" {
 #endif
 
 #include "pycore_atomic.h"          /* _Py_atomic_address */
+#include "pycore_dict.h"            // struct _Py_dict_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
@@ -135,6 +136,7 @@ typedef struct pyruntimestate {
     _Py_AuditHookEntry *audit_hook_head;
 
     struct _Py_unicode_runtime_ids unicode_ids;
+    struct _Py_dict_runtime_state dict_state;
 
     struct {
         /* Used to set PyTypeObject.tp_version_tag */

Include/internal/pycore_runtime_init.h

@@ -36,6 +36,9 @@ extern "C" {
               until _PyInterpreterState_Enable() is called. */ \
             .next_id = -1, \
         }, \
+        .dict_state = { \
+            .next_keys_version = 2, \
+        }, \
         .types = { \
             .next_version_tag = 1, \
         }, \

Objects/dictobject.c

@@ -5661,17 +5661,15 @@ _PyDictKeys_DecRef(PyDictKeysObject *keys)
     dictkeys_decref(keys);
 }
 
-static uint32_t next_dict_keys_version = 2;
-
 uint32_t _PyDictKeys_GetVersionForCurrentState(PyDictKeysObject *dictkeys)
 {
     if (dictkeys->dk_version != 0) {
         return dictkeys->dk_version;
     }
-    if (next_dict_keys_version == 0) {
+    if (_PyRuntime.dict_state.next_keys_version == 0) {
         return 0;
     }
-    uint32_t v = next_dict_keys_version++;
+    uint32_t v = _PyRuntime.dict_state.next_keys_version++;
     dictkeys->dk_version = v;
     return v;
 }

Tools/c-analyzer/cpython/globals-to-fix.tsv

@@ -417,7 +417,6 @@ Python/getargs.c	-	static_arg_parsers	-
 
 # other
 Objects/dictobject.c	-	_pydict_global_version	-
-Objects/dictobject.c	-	next_dict_keys_version	-
 Objects/funcobject.c	-	next_func_version	-
 Objects/object.c	-	_Py_RefTotal	-
 Python/perf_trampoline.c	-	perf_status	-