Merge branch 'main' of https://github.com/python/cpython into fix-asyncio-task-unregister-race

Author: jblespiau

Lib/asyncio/base_tasks.py

@@ -42,8 +42,11 @@ def _task_get_stack(task, limit):
     elif hasattr(task._coro, 'ag_frame'):
         # case 3: async generators
         f = task._coro.ag_frame
+    elif not task.done() and hasattr(task._coro, 'aga_gen'):
+        # case 4: async generator's asend/athrow/aclose
+        f = task._coro.aga_gen.ag_frame
     else:
-        # case 4: unknown objects
+        # case 5: unknown objects
         f = None
     if f is not None:
         while f is not None:

Lib/test/test_asyncio/test_tasks.py

@@ -335,6 +335,40 @@ async def runner():
 
         self.loop.run_until_complete(runner())
 
+    def test_get_stack_async_generator(self):
+        # gh-161178
+        async def gen():
+            try:
+                yield
+            except ValueError:
+                pass
+            finally:
+                await asyncio.sleep(0)
+            yield
+
+        async def runner(method, args):
+            agen = gen()
+            await anext(agen)
+            task = self.new_task(self.loop, getattr(agen, method)(*args))
+            await asyncio.sleep(0)
+            frame = agen.ag_frame
+            stack = task.get_stack()
+            await task
+            try:
+                self.assertEqual(stack, [frame])
+                self.assertEqual(task.get_stack(), [])
+            finally:
+                await agen.aclose()
+
+        for method, args in (
+            ('__anext__', ()),
+            ('asend', (None,)),
+            ('athrow', (ValueError(),)),
+            ('aclose', ()),
+        ):
+            with self.subTest(method=method):
+                self.loop.run_until_complete(runner(method, args))
+
     def test_task_repr(self):
         self.loop.set_debug(False)
 

Misc/NEWS.d/next/Library/2026-11-02-16-28-11.gh-issue-161178.D3-23R.rst

@@ -0,0 +1,2 @@
+Fix :meth:`asyncio.Task.print_stack` to include frames from async generator
+operations. Patch by Timofei Ivankov

Modules/_remote_debugging/clinic/module.c.h

@@ -1010,44 +1010,70 @@ For each thread with a running task, returns the running task plus
 all tasks that transitively depend on it (tasks waiting for the
 running task, tasks waiting for those tasks, etc.).
 
-Returns a list of per-thread results, where each thread result
-contains:
-- Thread ID
-- List of task information for the running task and all its waiters
+Returns:
+    A list of AwaitedInfo objects, where each object contains:
 
-Each task info contains:
-- Task ID (memory address)
-- Task name
-- Call stack frames: List of (func_name, filename, lineno)
-- List of tasks waiting for this task (recursive structure)
+    - thread_id (int): Identifier of the thread.
+    - awaited_by (list[TaskInfo]): The running task and all its
+      transitive waiters.
+
+Each TaskInfo contains:
+    - task_id (int): Identifier of the task.
+    - task_name (str): Name of the task.
+    - coroutine_stack (list[CoroInfo]): Stack of coroutine frames.
+    - awaited_by (list[CoroInfo]): Coroutine information for
+      tasks or futures awaiting this task.
+
+Each CoroInfo contains:
+    - call_stack (list[FrameInfo]): Frames for the coroutine.
+    - task_name (int): Identifier of the task or future.
+
+Each FrameInfo contains:
+    - filename (str): Source code filename.
+    - location (LocationInfo | None): Source location, if available.
+    - funcname (str): Function name.
+    - opcode (int | None): Opcode, if available.
+
+Each LocationInfo contains:
+    - lineno (int): Starting line number.
+    - end_lineno (int): Ending line number.
+    - col_offset (int): Starting column offset.
+    - end_col_offset (int): Ending column offset.
 
 Raises:
     RuntimeError: If AsyncioDebug section is not available in the
         target process
     MemoryError: If memory allocation fails
     OSError: If reading from the remote process fails
 
-Example output (similar structure to get_all_awaited_by but only for
-running tasks):
-[
-    # Thread 140234 results
-    (140234, [
-        # Running task and its complete waiter dependency graph
-        (4345585712, 'main_task',
-         [("run_server", "server.py", 127), ("main", "app.py", 23)],
-         [
-             # Tasks waiting for main_task
-             (4345585800, 'worker_1', [...], [...]),
-             (4345585900, 'worker_2', [...], [...])
-         ])
-    ])
-]
+Example output:
+
+    [
+        AwaitedInfo(thread_id=140234, awaited_by=[
+            TaskInfo(
+                task_id=1,
+                task_name="worker",
+                coroutine_stack=[
+                    CoroInfo(call_stack=[...], task_name=1)
+                ],
+                awaited_by=[CoroInfo(call_stack=[...], task_name=2)]
+            ),
+            TaskInfo(
+                task_id=2,
+                task_name="main",
+                coroutine_stack=[
+                    CoroInfo(call_stack=[...], task_name=2)
+                ],
+                awaited_by=[]
+            )
+        ])
+    ]
 
 [clinic start generated code]*/
 
 static PyObject *
 _remote_debugging_RemoteUnwinder_get_async_stack_trace_impl(RemoteUnwinderObject *self)
-/*[clinic end generated code: output=6433d52b55e87bbe input=bc802e4221c99399]*/
+/*[clinic end generated code: output=6433d52b55e87bbe input=0532031a7c495491]*/
 {
     if (ensure_async_debug_offsets(self) < 0) {
         return NULL;

Modules/_remote_debugging/module.c

@@ -737,9 +737,10 @@ w_tie_set_items(w_set_item *items, Py_ssize_t count, size_t first, WFILE *p)
                remembered it, and it cannot be written again. */
             continue;
         }
-        uintptr_t w = (uintptr_t)entry->value;
-        assert(!(w & (W_ENTRY_ACTIVE | W_ENTRY_TIED)));
-        assert((w >> W_ENTRY_SHIFT) - first < (size_t)count);
+        assert(!((uintptr_t)entry->value & (W_ENTRY_ACTIVE | W_ENTRY_TIED)));
+        assert(
+            ((uintptr_t)entry->value >> W_ENTRY_SHIFT) - first < (size_t)count
+        );
         entry->value = (void *)value;
     }
 }