Also fix references in make_gen and __code__

Author: sobolevn

Objects/clinic/funcobject.c.h

@@ -630,22 +630,33 @@ class function "PyFunctionObject *" "&PyFunction_Type"
 
 #include "clinic/funcobject.c.h"
 
+/*[clinic input]
+@critical_section
+@getter
+function.__code__
+[clinic start generated code]*/
+
 static PyObject *
-func_get_code(PyObject *self, void *Py_UNUSED(ignored))
+function___code___get_impl(PyFunctionObject *self)
+/*[clinic end generated code: output=da514d8da1cae70f input=71be2f0bec958b7e]*/
 {
-    PyFunctionObject *op = _PyFunction_CAST(self);
-    if (PySys_Audit("object.__getattr__", "Os", op, "__code__") < 0) {
+    if (PySys_Audit("object.__getattr__", "Os", self, "__code__") < 0) {
         return NULL;
     }
 
-    return Py_NewRef(op->func_code);
+    return Py_NewRef(self->func_code);
 }
 
+/*[clinic input]
+@critical_section
+@setter
+function.__code__
+[clinic start generated code]*/
+
 static int
-func_set_code(PyObject *self, PyObject *value, void *Py_UNUSED(ignored))
+function___code___set_impl(PyFunctionObject *self, PyObject *value)
+/*[clinic end generated code: output=3a90ece2bfc881d9 input=19f6eba9ab5d7b28]*/
 {
-    PyFunctionObject *op = _PyFunction_CAST(self);
-
     /* Not legal to del f.func_code or to set it to anything
      * other than a code object. */
     if (value == NULL || !PyCode_Check(value)) {
@@ -655,23 +666,23 @@ func_set_code(PyObject *self, PyObject *value, void *Py_UNUSED(ignored))
     }
 
     if (PySys_Audit("object.__setattr__", "OsO",
-                    op, "__code__", value) < 0) {
+                    self, "__code__", value) < 0) {
         return -1;
     }
 
     int nfree = ((PyCodeObject *)value)->co_nfreevars;
-    Py_ssize_t nclosure = (op->func_closure == NULL ? 0 :
-                                        PyTuple_GET_SIZE(op->func_closure));
+    Py_ssize_t nclosure = (self->func_closure == NULL ? 0 :
+                           PyTuple_GET_SIZE(self->func_closure));
     if (nclosure != nfree) {
         PyErr_Format(PyExc_ValueError,
                      "%U() requires a code object with %zd free vars,"
                      " not %d",
-                     op->func_name,
+                     self->func_name,
                      nclosure, nfree);
         return -1;
     }
 
-    PyObject *func_code = PyFunction_GET_CODE(op);
+    PyObject *func_code = PyFunction_GET_CODE(self);
     int old_flags = ((PyCodeObject *)func_code)->co_flags;
     int new_flags = ((PyCodeObject *)value)->co_flags;
     int mask = CO_GENERATOR | CO_COROUTINE | CO_ASYNC_GENERATOR;
@@ -684,9 +695,9 @@ func_set_code(PyObject *self, PyObject *value, void *Py_UNUSED(ignored))
         }
     }
 
-    handle_func_event(PyFunction_EVENT_MODIFY_CODE, op, value);
-    _PyFunction_ClearVersion(op);
-    Py_XSETREF(op->func_code, Py_NewRef(value));
+    handle_func_event(PyFunction_EVENT_MODIFY_CODE, self, value);
+    _PyFunction_ClearVersion(self);
+    Py_XSETREF(self->func_code, Py_NewRef(value));
     return 0;
 }
 
@@ -994,7 +1005,7 @@ _Py_set_function_type_params(PyThreadState *Py_UNUSED(ignored), PyObject *func,
 }
 
 static PyGetSetDef func_getsetlist[] = {
-    {"__code__", func_get_code, func_set_code},
+    FUNCTION___CODE___GETSETDEF
     {"__defaults__", func_get_defaults, func_set_defaults},
     {"__kwdefaults__", func_get_kwdefaults, func_set_kwdefaults},
     FUNCTION___ANNOTATIONS___GETSETDEF

Objects/funcobject.c

@@ -1106,10 +1106,12 @@ make_gen(PyTypeObject *type, PyFunctionObject *func)
     gen->gi_exc_state.exc_value = NULL;
     gen->gi_exc_state.previous_item = NULL;
     gen->gi_iframe.f_executable = PyStackRef_None;
+    Py_BEGIN_CRITICAL_SECTION((PyObject *)func);
     assert(func->func_name != NULL);
     gen->gi_name = Py_NewRef(func->func_name);
     assert(func->func_qualname != NULL);
     gen->gi_qualname = Py_NewRef(func->func_qualname);
+    Py_END_CRITICAL_SECTION();
     _PyObject_GC_TRACK(gen);
     return (PyObject *)gen;
 }