mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

[3.12] gh-106033: Get rid of PyDict_GetItem in _PyFunction_FromConstructor (GH-106044) (GH-106228)

Browse source 
gh-106033: Get rid of PyDict_GetItem in _PyFunction_FromConstructor (GH-106044)
(cherry picked from commit 08c08d21b0)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
Miss Islington (bot) 2023-06-29 03:45:39 -07:00 • committed by GitHub
parent e12045d648
commit e0fa531d7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/funcobject.c
View file

@ -106,9 +106,14 @@ PyFunction_ClearWatcher(int watcher_id)
PyFunctionObject * PyFunctionObject *
_PyFunction_FromConstructor(PyFrameConstructor *constr) _PyFunction_FromConstructor(PyFrameConstructor *constr)
{ {
PyObject *module = Py_XNewRef(PyDict_GetItemWithError(constr->fc_globals, &_Py_ID(__name__)));
if (!module && PyErr_Occurred()) {
return NULL;
}
PyFunctionObject *op = PyObject_GC_New(PyFunctionObject, &PyFunction_Type); PyFunctionObject *op = PyObject_GC_New(PyFunctionObject, &PyFunction_Type);
if (op == NULL) { if (op == NULL) {
Py_XDECREF(module);
return NULL; return NULL;
} }
op->func_globals = Py_NewRef(constr->fc_globals); op->func_globals = Py_NewRef(constr->fc_globals);
@ -122,10 +127,7 @@ _PyFunction_FromConstructor(PyFrameConstructor *constr)
op->func_doc = Py_NewRef(Py_None); op->func_doc = Py_NewRef(Py_None);
op->func_dict = NULL; op->func_dict = NULL;
op->func_weakreflist = NULL; op->func_weakreflist = NULL;
op->func_module = Py_XNewRef(PyDict_GetItem(op->func_globals, &_Py_ID(__name__))); op->func_module = module;
if (!op->func_module) {
PyErr_Clear();
}
op->func_annotations = NULL; op->func_annotations = NULL;
op->func_typeparams = NULL; op->func_typeparams = NULL;
op->vectorcall = _PyFunction_Vectorcall; op->vectorcall = _PyFunction_Vectorcall;