pythongh-120834: Use PyGenObject for generators, coroutines and async generators

Author: iritkatriel

Include/cpython/genobject.h

@@ -24,7 +24,7 @@ PyAPI_FUNC(PyCodeObject *) PyGen_GetCode(PyGenObject *gen);
 
 /* --- PyCoroObject ------------------------------------------------------- */
 
-typedef struct _PyCoroObject PyCoroObject;
+typedef PyGenObject PyCoroObject;
 
 PyAPI_DATA(PyTypeObject) PyCoro_Type;
 
@@ -35,7 +35,7 @@ PyAPI_FUNC(PyObject *) PyCoro_New(PyFrameObject *,
 
 /* --- Asynchronous Generators -------------------------------------------- */
 
-typedef struct _PyAsyncGenObject PyAsyncGenObject;
+typedef PyGenObject PyAsyncGenObject;
 
 PyAPI_DATA(PyTypeObject) PyAsyncGen_Type;
 PyAPI_DATA(PyTypeObject) _PyAsyncGenASend_Type;

Include/internal/pycore_ceval.h

@@ -232,7 +232,7 @@ static inline void _Py_LeaveRecursiveCall(void)  {
 
 extern struct _PyInterpreterFrame* _PyEval_GetFrame(void);
 
-PyAPI_FUNC(PyObject *)_Py_MakeCoro(PyFunctionObject *func);
+PyAPI_FUNC(PyGenObject *)_Py_MakeCoro(PyFunctionObject *func);
 
 /* Handle signals, pending calls, GIL drop request
    and asynchronous exception */

Include/internal/pycore_genobject.h

@@ -10,40 +10,25 @@ extern "C" {
 
 #include "pycore_frame.h"
 
-/* _PyGenObject_HEAD defines the initial segment of generator
-   and coroutine objects. */
-#define _PyGenObject_HEAD(prefix)                                           \
-    PyObject_HEAD                                                           \
-    /* List of weak reference. */                                           \
-    PyObject *prefix##_weakreflist;                                         \
-    /* Name of the generator. */                                            \
-    PyObject *prefix##_name;                                                \
-    /* Qualified name of the generator. */                                  \
-    PyObject *prefix##_qualname;                                            \
-    _PyErr_StackItem prefix##_exc_state;                                    \
-    PyObject *prefix##_origin_or_finalizer;                                 \
-    char prefix##_hooks_inited;                                             \
-    char prefix##_closed;                                                   \
-    char prefix##_running_async;                                            \
-    /* The frame */                                                         \
-    int8_t prefix##_frame_state;                                            \
-    struct _PyInterpreterFrame prefix##_iframe;                             \
-
 struct _PyGenObject {
-    /* The gi_ prefix is intended to remind of generator-iterator. */
-    _PyGenObject_HEAD(gi)
-};
-
-struct _PyCoroObject {
-    _PyGenObject_HEAD(cr)
+    /* The gi_ prefix is for generator-iterator. */
+    PyObject_HEAD                                               \
+    /* List of weak reference. */                               \
+    PyObject *gi_weakreflist;                                   \
+    /* Name of the generator. */                                \
+    PyObject *gi_name;                                          \
+    /* Qualified name of the generator. */                      \
+    PyObject *gi_qualname;                                      \
+    _PyErr_StackItem gi_exc_state;                              \
+    PyObject *gi_cr_origin_or_ag_finalizer;                     \
+    char gi_hooks_inited;                                       \
+    char gi_closed;                                             \
+    char gi_running_async;                                      \
+    /* The frame */                                             \
+    int8_t gi_frame_state;                                      \
+    struct _PyInterpreterFrame gi_iframe;                       \
 };
 
-struct _PyAsyncGenObject {
-    _PyGenObject_HEAD(ag)
-};
-
-#undef _PyGenObject_HEAD
-
 static inline
 PyGenObject *_PyGen_GetGeneratorFromFrame(_PyInterpreterFrame *frame)
 {

Include/internal/pycore_warnings.h

@@ -22,8 +22,8 @@ extern int _PyWarnings_InitState(PyInterpreterState *interp);
 
 extern PyObject* _PyWarnings_Init(void);
 
-extern void _PyErr_WarnUnawaitedCoroutine(PyObject *coro);
-extern void _PyErr_WarnUnawaitedAgenMethod(PyAsyncGenObject *agen, PyObject *method);
+extern void _PyErr_WarnUnawaitedCoroutine(PyGenObject *coro);
+extern void _PyErr_WarnUnawaitedAgenMethod(PyGenObject *agen, PyObject *method);
 
 #ifdef __cplusplus
 }