Assign type version when immortalizing heap

DinoV · Service User · commit 021b36b1608e · 2023-02-08T14:06:54.000-08:00
Summary: This causes us to assign version numbers for all types when we are immortalizing the heap. Test Plan: Reduces CoW's from types to just a handful of types: https://fburl.com/scuba/ig_cow_profiles/y23wyjt4 Reviewers: mpage, #cinder Reviewed By: mpage Subscribers: mpage, carljm, breynoso Differential Revision: https://phabricator.intern.facebook.com/D42935864 Tasks: T142439962 Tags: cinder-310-standalone-upstream-candidate
diff --git a/Cinder/Include/cinder/exports.h b/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);
diff --git a/Modules/gcmodule.c b/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;
     }
diff --git a/Objects/typeobject.c b/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},

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`#include "pycore_pyerrors.h"`
`32`	`32`	`#include "pycore_pystate.h" // _PyThreadState_GET()`
`33`	`33`	`#include "pydtrace.h"`
	`34`	`+#include "cinder/exports.h"`
`34`	`35`
`35`	`36`	`typedef struct _gc_runtime_state GCState;`
`36`	`37`
`@@ -2039,6 +2040,9 @@ immortalize_object(PyObject obj, PyObject /* unused */ args)`
`2039`	`2040`	`PyObject_Hash(obj);`
`2040`	`2041`	`}`
`2041`	`2042`
	`2043`	`+ if (PyType_Check(obj)) {`
	`2044`	`+ Ci_Type_AssignVersionTag((PyTypeObject *)obj);`
	`2045`	`+ }`
`2042`	`2046`	`if (!_PyImmortal_RecursiveHeapWalk) {`
`2043`	`2047`	`return 0;`
`2044`	`2048`	`}`