Cache borrowed references, cleared in func_dealloc

gvanrossum · gvanrossum · commit b408b2ba1532 · 2023-08-15T13:47:19.000-07:00
diff --git a/Include/internal/pycore_function.h b/Include/internal/pycore_function.h
@@ -19,9 +19,10 @@ extern PyObject* _PyFunction_Vectorcall(
 #define FUNC_VERSION_CACHE_SIZE (1<<12)  /* Must be a power of 2 */
 struct _py_func_state {
     uint32_t next_version;
-    // Function objects whose func_version % FUNC_VERSION_CACHE_SIZE
-    // once equaled the index in the table. The references are owned:
-    // Call _PyFunction_ClearByVersionCache() to clear.
+    // Borrowed references to function objects whose
+    // func_version % FUNC_VERSION_CACHE_SIZE
+    // once was equal to the index in the table.
+    // They are cleared when the function is deallocated.
     PyFunctionObject *func_version_cache[FUNC_VERSION_CACHE_SIZE];
 };
 
@@ -30,7 +31,6 @@ extern PyFunctionObject* _PyFunction_FromConstructor(PyFrameConstructor *constr)
 extern uint32_t _PyFunction_GetVersionForCurrentState(PyFunctionObject *func);
 extern void _PyFunction_SetVersion(PyFunctionObject *func, uint32_t version);
 PyFunctionObject *_PyFunction_LookupByVersion(uint32_t version);
-void _PyFunction_ClearByVersionCache(PyInterpreterState *interp);
 
 extern PyObject *_Py_set_function_type_params(
     PyThreadState* unused, PyObject *func, PyObject *type_params);
diff --git a/Objects/funcobject.c b/Objects/funcobject.c
@@ -271,35 +271,23 @@ _PyFunction_SetVersion(PyFunctionObject *func, uint32_t version)
     func->func_version = version;
     if (version != 0) {
         PyInterpreterState *interp = _PyInterpreterState_GET();
-        PyFunctionObject **slot =
-            interp->func_state.func_version_cache
-            + (version % FUNC_VERSION_CACHE_SIZE);
-        Py_XSETREF(*slot, (PyFunctionObject *)Py_NewRef(func));
+        interp->func_state.func_version_cache[
+            version % FUNC_VERSION_CACHE_SIZE] = func;
     }
 }
 
 PyFunctionObject *
 _PyFunction_LookupByVersion(uint32_t version)
 {
     PyInterpreterState *interp = _PyInterpreterState_GET();
-    PyFunctionObject **slot =
-        interp->func_state.func_version_cache
-        + (version % FUNC_VERSION_CACHE_SIZE);
-    if (*slot != NULL && (*slot)->func_version == version) {
-        return (PyFunctionObject *)Py_NewRef(*slot);
+    PyFunctionObject *func = interp->func_state.func_version_cache[
+        version % FUNC_VERSION_CACHE_SIZE];
+    if (func != NULL && func->func_version == version) {
+        return (PyFunctionObject *)Py_NewRef(func);
     }
     return NULL;
 }
 
-void
-_PyFunction_ClearByVersionCache(PyInterpreterState *interp)
-{
-    for (int i = 0; i < FUNC_VERSION_CACHE_SIZE; i++) {
-        PyFunctionObject **slot = interp->func_state.func_version_cache + i;
-        Py_CLEAR(*slot);
-    }
-}
-
 uint32_t
 _PyFunction_GetVersionForCurrentState(PyFunctionObject *func)
 {
@@ -929,6 +917,15 @@ func_dealloc(PyFunctionObject *op)
     if (op->func_weakreflist != NULL) {
         PyObject_ClearWeakRefs((PyObject *) op);
     }
+    if (op->func_version != 0) {
+        PyInterpreterState *interp = _PyInterpreterState_GET();
+        PyFunctionObject **slot =
+            interp->func_state.func_version_cache
+            + (op->func_version % FUNC_VERSION_CACHE_SIZE);
+        if (*slot == op) {
+            *slot = NULL;
+        }
+    }
     (void)func_clear(op);
     // These aren't cleared by func_clear().
     Py_DECREF(op->func_code);
diff --git a/Python/abstract_interp_cases.c.h b/Python/abstract_interp_cases.c.h
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1767,11 +1767,6 @@ Py_FinalizeEx(void)
     // XXX assert(_Py_IsMainInterpreter(tstate->interp));
     // XXX assert(_Py_IsMainThread());
 
-    // The function version cache keeps functions alive, so clear it.
-    // It's used for optimizations, which we don't need in this stage.
-    tstate->interp->func_state.next_version = 0;  // No more new versions
-    _PyFunction_ClearByVersionCache(tstate->interp);
-
     // Block some operations.
     tstate->interp->finalizing = 1;
 
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -2079,9 +2079,6 @@ sys__clear_type_cache_impl(PyObject *module)
 /*[clinic end generated code: output=20e48ca54a6f6971 input=127f3e04a8d9b555]*/
 {
     PyType_ClearCache();
-    // Also clear the function-by-version cache
-    PyInterpreterState *interp = _PyInterpreterState_GET();
-    _PyFunction_ClearByVersionCache(interp);
     Py_RETURN_NONE;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2079,9 +2079,6 @@ sys__clear_type_cache_impl(PyObject *module)`
`2079`	`2079`	`/[clinic end generated code: output=20e48ca54a6f6971 input=127f3e04a8d9b555]/`
`2080`	`2080`	`{`
`2081`	`2081`	`PyType_ClearCache();`
`2082`		`- // Also clear the function-by-version cache`
`2083`		`- PyInterpreterState *interp = _PyInterpreterState_GET();`
`2084`		`- _PyFunction_ClearByVersionCache(interp);`
`2085`	`2082`	`Py_RETURN_NONE;`
`2086`	`2083`	`}`
`2087`	`2084`