gh-100227: Move dict_state.global_version to PyInterpreterState (gh-102338)

#100227

Author: ericsnowcurrently

Include/internal/pycore_dict.h

@@ -149,8 +149,8 @@ static inline PyDictUnicodeEntry* DK_UNICODE_ENTRIES(PyDictKeysObject *dk) {
 #define DICT_VERSION_INCREMENT (1 << DICT_MAX_WATCHERS)
 #define DICT_VERSION_MASK (DICT_VERSION_INCREMENT - 1)
 
-#define DICT_NEXT_VERSION() \
- (_PyRuntime.dict_state.global_version += DICT_VERSION_INCREMENT)
+#define DICT_NEXT_VERSION(INTERP) \
+ ((INTERP)->dict_state.global_version += DICT_VERSION_INCREMENT)
 
 void
 _PyDict_SendEvent(int watcher_bits,
@@ -160,7 +160,8 @@ _PyDict_SendEvent(int watcher_bits,
  PyObject *value);
 
 static inline uint64_t
-_PyDict_NotifyEvent(PyDict_WatchEvent event,
+_PyDict_NotifyEvent(PyInterpreterState *interp,
+ PyDict_WatchEvent event,
  PyDictObject *mp,
  PyObject *key,
  PyObject *value)
@@ -169,9 +170,9 @@ _PyDict_NotifyEvent(PyDict_WatchEvent event,
  int watcher_bits = mp->ma_version_tag & DICT_VERSION_MASK;
  if (watcher_bits) {
  _PyDict_SendEvent(watcher_bits, event, mp, key, value);
- return DICT_NEXT_VERSION() | watcher_bits;
+ return DICT_NEXT_VERSION(interp) | watcher_bits;
  }
- return DICT_NEXT_VERSION();
+ return DICT_NEXT_VERSION(interp);
 }
 
 extern PyObject *_PyObject_MakeDictFromInstanceAttributes(PyObject *obj, PyDictValues *values);

Include/internal/pycore_dict_state.h

@@ -9,14 +9,6 @@ extern "C" {
 #endif
 
 
-struct _Py_dict_runtime_state {
- /*Global counter used to set ma_version_tag field of dictionary.
- * It is incremented each time that a dictionary is created and each
- * time that a dictionary is modified. */
- uint64_t global_version;
-};
-
-
 #ifndef WITH_FREELISTS
 // without freelists
 # define PyDict_MAXFREELIST 0
@@ -29,6 +21,10 @@ struct _Py_dict_runtime_state {
 #define DICT_MAX_WATCHERS 8
 
 struct _Py_dict_state {
+ /*Global counter used to set ma_version_tag field of dictionary.
+ * It is incremented each time that a dictionary is created and each
+ * time that a dictionary is modified. */
+ uint64_t global_version;
  uint32_t next_keys_version;
 
 #if PyDict_MAXFREELIST > 0

Include/internal/pycore_runtime.h

@@ -10,7 +10,6 @@ extern "C" {
 
 #include "pycore_atomic.h" /* _Py_atomic_address */
 #include "pycore_ceval_state.h" // struct _ceval_runtime_state
-#include "pycore_dict_state.h" // struct _Py_dict_runtime_state
 #include "pycore_floatobject.h" // struct _Py_float_runtime_state
 #include "pycore_faulthandler.h" // struct _faulthandler_runtime_state
 #include "pycore_global_objects.h" // struct _Py_global_objects
@@ -153,7 +152,6 @@ typedef struct pyruntimestate {
 
  struct _Py_float_runtime_state float_state;
  struct _Py_unicode_runtime_state unicode_state;
- struct _Py_dict_runtime_state dict_state;
 
  struct {
  /* Used to set PyTypeObject.tp_version_tag */