Assign type version when immortalizing heap

Summary: This causes us to assign version numbers for all types when we are immortalizing the heap.

Reviewed By: mpage

Differential Revision: D42935864

fbshipit-source-id: 021b36b

Author: DinoV

Cinder/Include/cinder/exports.h

@@ -91,6 +91,8 @@ PyAPI_FUNC(PyObject *) Ci_Tuple_Repeat(PyTupleObject *, Py_ssize_t);
 
 #define Ci_Py_TPFLAGS_FROZEN (1UL << 21)
 
+PyAPI_FUNC(int) Ci_Type_AssignVersionTag(PyTypeObject *);
+
 // Implementation in Python/bltinmodule.c
 PyObject *
 builtin_next(PyObject *self, PyObject *const *args, Py_ssize_t nargs);

Modules/gcmodule.c

@@ -31,6 +31,7 @@
 #include "pycore_pyerrors.h"
 #include "pycore_pystate.h"     // _PyThreadState_GET()
 #include "pydtrace.h"
+#include "cinder/exports.h"
 
 typedef struct _gc_runtime_state GCState;
 
@@ -2039,6 +2040,9 @@ immortalize_object(PyObject *obj, PyObject * /* unused */ args)
         PyObject_Hash(obj);
     }
 
+    if (PyType_Check(obj)) {
+        Ci_Type_AssignVersionTag((PyTypeObject *)obj);
+    }
     if (!_PyImmortal_RecursiveHeapWalk) {
       return 0;
     }

Objects/typeobject.c

@@ -529,6 +529,11 @@ assign_version_tag(struct type_cache *cache, PyTypeObject *type)
     return 1;
 }
 
+int
+Ci_Type_AssignVersionTag(PyTypeObject *type) {
+    return assign_version_tag(get_type_cache(), type);
+}
+
 
 static PyMemberDef type_members[] = {
     {"__basicsize__", T_PYSSIZET, offsetof(PyTypeObject,tp_basicsize),READONLY},