Use _PyDict_GetKeysVersionForCurrentState to get version_tag from dictionaries

Summary:
The `ma_version_tag` field no longer exists.

We also now have a type for the tag value which switches between 32 or 64 bits depending on Python version.

Reviewed By: DinoV

Differential Revision: D83861595

fbshipit-source-id: c6da67156441d201dfa8c25fb79aa252498c723c

Author: jbower-fb

cinderx/Common/dict.h

@@ -4,6 +4,13 @@
 
 #include "cinderx/python.h"
 
+#if PY_VERSION_HEX >= 0x030C0000
+// This needs to come before borrowed.h
+#include "pycore_dict.h"
+#endif
+
+#include "cinderx/UpstreamBorrow/borrowed.h"
+
 #include <stdbool.h>
 
 #ifdef __cplusplus
@@ -85,6 +92,18 @@ static inline uint32_t dictGetKeysVersion(
 }
 #endif
 
+#if PY_VERSION_HEX >= 0x030E0000
+typedef uint32_t ci_dict_version_tag_t;
+static inline ci_dict_version_tag_t Ci_DictVersionTag(PyDictObject* dict) {
+  return _PyDict_GetKeysVersionForCurrentState(_PyInterpreterState_GET(), dict);
+}
+#else
+typedef uint64_t ci_dict_version_tag_t;
+static inline ci_dict_version_tag_t Ci_DictVersionTag(PyDictObject* dict) {
+  return dict->ma_version_tag;
+}
+#endif
+
 #ifdef __cplusplus
 } // extern "C"
 #endif

cinderx/Jit/inline_cache.cpp

@@ -106,27 +106,23 @@ PyObject* __attribute__((noinline)) raise_attribute_error(
   return nullptr;
 }
 
-uint64_t getModuleVersion(BorrowedRef<PyModuleObject> mod) {
-#if PY_VERSION_HEX < 0x030E0000 // TASK(T229234686)
+ci_dict_version_tag_t getModuleVersion(BorrowedRef<PyModuleObject> mod) {
   if (mod->md_dict) {
     BorrowedRef<PyDictObject> md_dict = mod->md_dict;
-    return md_dict->ma_version_tag;
+    return Ci_DictVersionTag(md_dict.get());
   }
-#endif
   return 0;
 }
 
-uint64_t getModuleVersion(BorrowedRef<Ci_StrictModuleObject> mod) {
-#if PY_VERSION_HEX < 0x030E0000 // TASK(T229234686)
+ci_dict_version_tag_t getModuleVersion(BorrowedRef<Ci_StrictModuleObject> mod) {
   if (mod->globals) {
     BorrowedRef<PyDictObject> globals = mod->globals;
-    return globals->ma_version_tag;
+    return Ci_DictVersionTag(globals.get());
   }
-#endif
   return 0;
 }
 
-uint64_t getModuleVersion(BorrowedRef<> obj) {
+ci_dict_version_tag_t getModuleVersion(BorrowedRef<> obj) {
   if (PyModule_Check(obj)) {
     BorrowedRef<PyModuleObject> mod{obj};
     return getModuleVersion(mod);
@@ -1380,7 +1376,7 @@ LoadMethodResult LoadModuleMethodCache::lookup(
     BorrowedRef<> obj,
     BorrowedRef<> name) {
   if (module_obj_ == obj && value_ != nullptr) {
-    uint64_t version = 0;
+    ci_dict_version_tag_t version = 0;
     if (PyModule_Check(obj)) {
       BorrowedRef<PyModuleObject> mod{obj};
       version = getModuleVersion(mod);
@@ -1430,7 +1426,7 @@ LoadModuleMethodCache::lookupSlowPath(BorrowedRef<> obj, BorrowedRef<> name) {
 void LoadModuleMethodCache::fill(
     BorrowedRef<> obj,
     BorrowedRef<> value,
-    uint64_t version) {
+    ci_dict_version_tag_t version) {
   module_obj_ = obj;
   value_ = value;
   module_version_ = version;

cinderx/Jit/inline_cache.h

@@ -4,6 +4,7 @@
 
 #include "cinderx/python.h"
 
+#include "cinderx/Common/dict.h"
 #include "cinderx/Common/ref.h"
 #include "cinderx/Common/util.h"
 #include "cinderx/Jit/config.h"
@@ -330,11 +331,12 @@ class LoadModuleAttrCache {
 
  private:
   PyObject* lookupSlowPath(BorrowedRef<> obj, BorrowedRef<> name);
-  void fill(BorrowedRef<> obj, BorrowedRef<> value, uint64_t version);
+  void
+  fill(BorrowedRef<> obj, BorrowedRef<> value, ci_dict_version_tag_t version);
 
   // This corresponds to module __dict__'s version which allows us
   // to correctly invalidate the cache whenever the dictionary changes.
-  uint64_t version_{0};
+  ci_dict_version_tag_t version_{0};
   BorrowedRef<> module_;
   BorrowedRef<> value_;
 };
@@ -351,11 +353,12 @@ class LoadModuleMethodCache {
 
  private:
   LoadMethodResult lookupSlowPath(BorrowedRef<> obj, BorrowedRef<> name);
-  void fill(BorrowedRef<> obj, BorrowedRef<> value, uint64_t version);
+  void
+  fill(BorrowedRef<> obj, BorrowedRef<> value, ci_dict_version_tag_t version);
 
   // This corresponds to module __dict__'s version which allows us
   // to correctly invalidate the cache whenever the dictionary changes.
-  uint64_t module_version_{0};
+  ci_dict_version_tag_t module_version_{0};
   BorrowedRef<> module_obj_;
   BorrowedRef<> value_;
 };

cinderx/UpstreamBorrow/borrowed.h

@@ -240,6 +240,12 @@ PyObject* Ci_Builtin_Next_Core(PyObject* it, PyObject* def);
 void Cix_gen_dealloc_with_custom_free(PyObject* obj);
 #endif
 
+#if PY_VERSION_HEX >= 0x030E0000
+uint32_t _CiDict_GetKeysVersionForCurrentState(
+    PyInterpreterState* interp,
+    PyDictObject* dict);
+#endif
+
 #ifdef ENABLE_PEP523_HOOK
 extern _PyFrameEvalFunction Ci_EvalFrameFunc;
 #endif