Merge branch 'main' of https://github.com/python/cpython into linked-…

…list
python · willingc · Jun 22, 2024 · May 24, 2023 · May 26, 2023 · May 26, 2023
commit 5a001984f355c20eb56db5bf4387fa8587141065
@@ -33,28 +33,28 @@ typedef enum {
     PyObject *prefix##_result;                                              \
     PyObject *prefix##_source_tb;                                           \
     PyObject *prefix##_cancel_msg;                                          \
-    fut_state prefix##_state;                                               \
-    int prefix##_log_tb;                                                    \
-    int prefix##_blocking;                                                  \
-    PyObject *dict;                                                         \
     PyObject *prefix##_weakreflist;                                         \
-    PyObject *prefix##_cancelled_exc;
+        PyObject *prefix##_cancelled_exc;                                       \
+    fut_state prefix##_state;                                               \
+    /* These bitfields need to be at the end of the struct
+       so that these and bitfields from TaskObj are contiguous.
+    */                                                                      \
+    unsigned prefix##_log_tb: 1;                                            \
+    unsigned prefix##_blocking: 1;
 
 typedef struct {
     FutureObj_HEAD(fut)
 } FutureObj;
 
-typedef struct TaskObj {
+typedef struct {
     FutureObj_HEAD(task)
+    unsigned task_must_cancel: 1;
+    unsigned task_log_destroy_pending: 1;
+    int task_num_cancels_requested;
     PyObject *task_fut_waiter;
     PyObject *task_coro;
     PyObject *task_name;
     PyObject *task_context;
-    int task_must_cancel;
-    int task_log_destroy_pending;
-    int task_num_cancels_requested;
-    struct TaskObj *next;
-    struct TaskObj *prev;
 } TaskObj;
 
 typedef struct {
@@ -161,7 +161,6 @@ get_asyncio_state_by_def(PyObject *self)
     return get_asyncio_state(mod);
 }
 
-
 #include "clinic/_asynciomodule.c.h"