mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 19:34:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

gh-108253: Fix bug in func version cache (#108296)

Browse source 
When a function object changed its version, a stale pointer might remain in the cache.
Zap these whenever `func_version` changes (even when set to 0).
This commit is contained in:
Guido van Rossum 2023-08-22 08:29:49 -07:00 • committed by GitHub
parent adfc118fda
commit b8f96b5eda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Objects/funcobject.c
View file

@ -131,7 +131,7 @@ _PyFunction_FromConstructor(PyFrameConstructor *constr)
op->func_annotations = NULL; op->func_annotations = NULL;
op->func_typeparams = NULL; op->func_typeparams = NULL;
op->vectorcall = _PyFunction_Vectorcall; op->vectorcall = _PyFunction_Vectorcall;
op->func_version = 0; _PyFunction_SetVersion(op, 0);
_PyObject_GC_TRACK(op); _PyObject_GC_TRACK(op);
handle_func_event(PyFunction_EVENT_CREATE, op, NULL); handle_func_event(PyFunction_EVENT_CREATE, op, NULL);
return op; return op;
@ -207,7 +207,7 @@ PyFunction_NewWithQualName(PyObject *code, PyObject *globals, PyObject *qualname
op->func_annotations = NULL; op->func_annotations = NULL;
op->func_typeparams = NULL; op->func_typeparams = NULL;
op->vectorcall = _PyFunction_Vectorcall; op->vectorcall = _PyFunction_Vectorcall;
op->func_version = 0; _PyFunction_SetVersion(op, 0);
_PyObject_GC_TRACK(op); _PyObject_GC_TRACK(op);
handle_func_event(PyFunction_EVENT_CREATE, op, NULL); handle_func_event(PyFunction_EVENT_CREATE, op, NULL);
return (PyObject *)op; return (PyObject *)op;
@ -268,9 +268,17 @@ code objects have been created during the process's lifetime.
void void
_PyFunction_SetVersion(PyFunctionObject *func, uint32_t version) _PyFunction_SetVersion(PyFunctionObject *func, uint32_t version)
{ {
PyInterpreterState *interp = _PyInterpreterState_GET();
if (func->func_version != 0) {
PyFunctionObject **slot =
interp->func_state.func_version_cache
+ (func->func_version % FUNC_VERSION_CACHE_SIZE);
if (*slot == func) {
*slot = NULL;
}
}
func->func_version = version; func->func_version = version;
if (version != 0) { if (version != 0) {
PyInterpreterState *interp = _PyInterpreterState_GET();
interp->func_state.func_version_cache[ interp->func_state.func_version_cache[
version % FUNC_VERSION_CACHE_SIZE] = func; version % FUNC_VERSION_CACHE_SIZE] = func;
} }
@ -370,7 +378,7 @@ PyFunction_SetDefaults(PyObject *op, PyObject *defaults)
} }
handle_func_event(PyFunction_EVENT_MODIFY_DEFAULTS, handle_func_event(PyFunction_EVENT_MODIFY_DEFAULTS,
(PyFunctionObject *) op, defaults); (PyFunctionObject *) op, defaults);
((PyFunctionObject *)op)->func_version = 0; _PyFunction_SetVersion((PyFunctionObject *)op, 0);
Py_XSETREF(((PyFunctionObject *)op)->func_defaults, defaults); Py_XSETREF(((PyFunctionObject *)op)->func_defaults, defaults);
return 0; return 0;
} }
@ -379,7 +387,7 @@ void
PyFunction_SetVectorcall(PyFunctionObject *func, vectorcallfunc vectorcall) PyFunction_SetVectorcall(PyFunctionObject *func, vectorcallfunc vectorcall)
{ {
assert(func != NULL); assert(func != NULL);
func->func_version = 0; _PyFunction_SetVersion(func, 0);
func->vectorcall = vectorcall; func->vectorcall = vectorcall;
} }
@ -412,7 +420,7 @@ PyFunction_SetKwDefaults(PyObject *op, PyObject *defaults)
} }
handle_func_event(PyFunction_EVENT_MODIFY_KWDEFAULTS, handle_func_event(PyFunction_EVENT_MODIFY_KWDEFAULTS,
(PyFunctionObject *) op, defaults); (PyFunctionObject *) op, defaults);
((PyFunctionObject *)op)->func_version = 0; _PyFunction_SetVersion((PyFunctionObject *)op, 0);
Py_XSETREF(((PyFunctionObject *)op)->func_kwdefaults, defaults); Py_XSETREF(((PyFunctionObject *)op)->func_kwdefaults, defaults);
return 0; return 0;
} }
@ -445,7 +453,7 @@ PyFunction_SetClosure(PyObject *op, PyObject *closure)
Py_TYPE(closure)->tp_name); Py_TYPE(closure)->tp_name);
return -1; return -1;
} }
((PyFunctionObject *)op)->func_version = 0; _PyFunction_SetVersion((PyFunctionObject *)op, 0);
Py_XSETREF(((PyFunctionObject *)op)->func_closure, closure); Py_XSETREF(((PyFunctionObject *)op)->func_closure, closure);
return 0; return 0;
} }
@ -507,7 +515,7 @@ PyFunction_SetAnnotations(PyObject *op, PyObject *annotations)
"non-dict annotations"); "non-dict annotations");
return -1; return -1;
} }
((PyFunctionObject *)op)->func_version = 0; _PyFunction_SetVersion((PyFunctionObject *)op, 0);
Py_XSETREF(((PyFunctionObject *)op)->func_annotations, annotations); Py_XSETREF(((PyFunctionObject *)op)->func_annotations, annotations);
return 0; return 0;
} }
@ -566,7 +574,7 @@ func_set_code(PyFunctionObject *op, PyObject *value, void *Py_UNUSED(ignored))
return -1; return -1;
} }
handle_func_event(PyFunction_EVENT_MODIFY_CODE, op, value); handle_func_event(PyFunction_EVENT_MODIFY_CODE, op, value);
op->func_version = 0; _PyFunction_SetVersion(op, 0);
Py_XSETREF(op->func_code, Py_NewRef(value)); Py_XSETREF(op->func_code, Py_NewRef(value));
return 0; return 0;
} }
@ -646,7 +654,7 @@ func_set_defaults(PyFunctionObject *op, PyObject *value, void *Py_UNUSED(ignored
} }
handle_func_event(PyFunction_EVENT_MODIFY_DEFAULTS, op, value); handle_func_event(PyFunction_EVENT_MODIFY_DEFAULTS, op, value);
op->func_version = 0; _PyFunction_SetVersion(op, 0);
Py_XSETREF(op->func_defaults, Py_XNewRef(value)); Py_XSETREF(op->func_defaults, Py_XNewRef(value));
return 0; return 0;
} }
@ -687,7 +695,7 @@ func_set_kwdefaults(PyFunctionObject *op, PyObject *value, void *Py_UNUSED(ignor
} }
handle_func_event(PyFunction_EVENT_MODIFY_KWDEFAULTS, op, value); handle_func_event(PyFunction_EVENT_MODIFY_KWDEFAULTS, op, value);
op->func_version = 0; _PyFunction_SetVersion(op, 0);
Py_XSETREF(op->func_kwdefaults, Py_XNewRef(value)); Py_XSETREF(op->func_kwdefaults, Py_XNewRef(value));
return 0; return 0;
} }
@ -717,7 +725,7 @@ func_set_annotations(PyFunctionObject *op, PyObject *value, void *Py_UNUSED(igno
"__annotations__ must be set to a dict object"); "__annotations__ must be set to a dict object");
return -1; return -1;
} }
op->func_version = 0; _PyFunction_SetVersion(op, 0);
Py_XSETREF(op->func_annotations, Py_XNewRef(value)); Py_XSETREF(op->func_annotations, Py_XNewRef(value));
return 0; return 0;
} }
@ -881,7 +889,7 @@ func_new_impl(PyTypeObject *type, PyCodeObject *code, PyObject *globals,
static int static int
func_clear(PyFunctionObject *op) func_clear(PyFunctionObject *op)
{ {
op->func_version = 0; _PyFunction_SetVersion(op, 0);
Py_CLEAR(op->func_globals); Py_CLEAR(op->func_globals);
Py_CLEAR(op->func_builtins); Py_CLEAR(op->func_builtins);
Py_CLEAR(op->func_module); Py_CLEAR(op->func_module);
@ -917,15 +925,7 @@ func_dealloc(PyFunctionObject *op)
if (op->func_weakreflist != NULL) { if (op->func_weakreflist != NULL) {
PyObject_ClearWeakRefs((PyObject *) op); PyObject_ClearWeakRefs((PyObject *) op);
} }
if (op->func_version != 0) { _PyFunction_SetVersion(op, 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); (void)func_clear(op);
// These aren't cleared by func_clear(). // These aren't cleared by func_clear().
Py_DECREF(op->func_code); Py_DECREF(op->func_code);