review changes

Author: deadlovelll

Lib/test/test_external_inspection.py

@@ -14,6 +14,7 @@
 from unittest.mock import ANY
 from test.support import (
     os_helper,
+    threading_helper,
     SHORT_TIMEOUT,
     busy_retry,
     requires_gil_enabled,
@@ -639,6 +640,36 @@ async def main():
         self.assertIn([["sleep", "child"], ["main"]], stacks)
         self.assertIn([[], ["main"]], stacks)
 
+    @skip_if_not_supported
+    def test_running_task_frame_not_in_thread_stack(self):
+        # gh-159645
+        ready = threading.Event()
+        release = threading.Event()
+
+        async def child():
+            ready.set()
+            release.wait()
+            await asyncio.sleep(0)
+
+        async def main():
+            loop = asyncio.get_running_loop()
+            coro = child()
+            task = asyncio.create_task(coro, name="child")
+            thread = threading.Thread(target=coro.send, args=(None,))
+            with threading_helper.start_threads([thread], unlock=release.set):
+                self.assertTrue(ready.wait(SHORT_TIMEOUT))
+                self.assertTrue(coro.cr_running)
+                previous = tasks._swap_current_task(loop, task)
+                try:
+                    trace = RemoteUnwinder(os.getpid()).get_async_stack_trace()
+                finally:
+                    tasks._swap_current_task(loop, previous)
+            await task
+            return trace
+
+        stacks = self._extract_coroutine_funcnames(asyncio.run(main()))
+        self.assertEqual(stacks["child"], ["child"])
+
     @skip_if_not_supported
     def test_running_task_with_non_native_coroutine(self):
         # gh-159645

Modules/_remote_debugging/asyncio.c

@@ -770,20 +770,6 @@ get_task_frame(RemoteUnwinderObject *unwinder, uintptr_t task_addr, uintptr_t *f
         return 0;
     }
 
-    int8_t frame_state;
-    if (_Py_RemoteDebug_PagedReadRemoteMemory(
-            &unwinder->handle,
-            running_coro_addr + (uintptr_t)unwinder->debug_offsets.gen_object.gi_frame_state,
-            sizeof(frame_state),
-            &frame_state) < 0) {
-        set_exception_cause(unwinder, PyExc_RuntimeError, "Running task coro frame state read failed");
-        return -1;
-    }
-    if (frame_state != FRAME_EXECUTING) {
-        *frame_addr = 0;
-        return 0;
-    }
-
     *frame_addr = running_coro_addr + (uintptr_t)unwinder->debug_offsets.gen_object.gi_iframe;
     return 0;
 }
@@ -799,6 +785,7 @@ parse_async_frame_chain(
     uintptr_t address_of_thread,
     uintptr_t running_task_frame
 ) {
+    Py_ssize_t coro_chain_size = PyList_GET_SIZE(calls);
     uintptr_t address_of_current_frame;
     if (find_running_frame(unwinder, address_of_thread, &address_of_current_frame) < 0) {
         set_exception_cause(unwinder, PyExc_RuntimeError, "Running frame search failed in async chain");
@@ -844,11 +831,12 @@ parse_async_frame_chain(
         // Stop at the task's own frame. Code objects are shared by
         // recursive calls, so they cannot identify it.
         if (this_frame == running_task_frame) {
-            break;
+            return PyList_SetSlice(calls, 0, coro_chain_size, NULL);
         }
     }
 
-    return 0;
+    // gh-159645: keep the coroutine chain if the task's frame was not found.
+    return PyList_SetSlice(calls, coro_chain_size, PY_SSIZE_T_MAX, NULL);
 }
 
 /* ============================================================================
@@ -990,7 +978,7 @@ process_running_task_chain(
         return -1;
     }
 
-    // gh-159645: the coroutine isn't running, so keep its await chain.
+    // gh-159645: non-native coroutines have no frame to look for.
     if (running_task_frame == 0) {
         return process_task_waiters(unwinder, result);
     }
@@ -1010,12 +998,6 @@ process_running_task_chain(
     PyObject *frame_chain = PyStructSequence_GET_ITEM(coro_info, 0);
     assert(frame_chain != NULL);
 
-    // Clear the coro_chain
-    if (PyList_Clear(frame_chain) < 0) {
-        set_exception_cause(unwinder, PyExc_RuntimeError, "Failed to clear coroutine chain");
-        return -1;
-    }
-
     // Add the chain from the current frame to this task
     if (parse_async_frame_chain(unwinder, frame_chain, thread_state_addr, running_task_frame) < 0) {
         return -1;