fix thenable async stack trace

devsnek · V8 LUCI CQ · commit 9dc9c63e646b · 2025-08-07T06:39:30.000-07:00
Bug: 332083029 Change-Id: Ia8fc66b18d64f014b5f5546a171abb8821d8c645 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6826001 Reviewed-by: Leszek Swirski <leszeks@chromium.org> Commit-Queue: snek <snek@chromium.org> Cr-Commit-Position: refs/heads/main@{#101788}
diff --git a/src/execution/isolate.cc b/src/execution/isolate.cc
@@ -1328,6 +1328,12 @@ MaybeDirectHandle<JSPromise> TryGetCurrentTaskPromise(Isolate* isolate) {
         return promise;
       }
     }
+  } else if (IsPromiseResolveThenableJobTask(*current_microtask)) {
+    auto promise_resolve_thenable_job_task =
+        Cast<PromiseResolveThenableJobTask>(current_microtask);
+    DirectHandle<JSPromise> promise(
+        promise_resolve_thenable_job_task->promise_to_resolve(), isolate);
+    return promise;
   }
   return MaybeDirectHandle<JSPromise>();
 }
diff --git a/test/mjsunit/async-stack-traces.js b/test/mjsunit/async-stack-traces.js
@@ -354,3 +354,36 @@
     await test(one);
   })());
 })();
+
+// test thenable job
+(function() {
+  async function one(x) {
+    await two(x);
+  }
+
+  async function two(x) {
+    await x;
+    await { then() { throw new Error() } };
+  }
+
+  async function test(f) {
+    try {
+      await f(1);
+      assertUnreachable();
+    } catch (e) {
+      assertInstanceof(e, Error);
+      assertMatches(/Error.+at Object\.then.+at async two.+at async one.+at async test/ms, e.stack);
+    }
+  }
+
+  assertPromiseResult((async () => {
+    %PrepareFunctionForOptimization(one);
+    %PrepareFunctionForOptimization(two);
+    await test(one);
+    await test(one);
+    %OptimizeFunctionOnNextCall(two);
+    await test(one);
+    %OptimizeFunctionOnNextCall(one);
+    await test(one);
+  })());
+})();

Original file line number	Diff line number	Diff line change
`@@ -1328,6 +1328,12 @@ MaybeDirectHandle<JSPromise> TryGetCurrentTaskPromise(Isolate* isolate) {`
`1328`	`1328`	`return promise;`
`1329`	`1329`	`}`
`1330`	`1330`	`}`
	`1331`	`+ } else if (IsPromiseResolveThenableJobTask(*current_microtask)) {`
	`1332`	`+ auto promise_resolve_thenable_job_task =`
	`1333`	`+ Cast<PromiseResolveThenableJobTask>(current_microtask);`
	`1334`	`+ DirectHandle<JSPromise> promise(`
	`1335`	`+ promise_resolve_thenable_job_task->promise_to_resolve(), isolate);`
	`1336`	`+ return promise;`
`1331`	`1337`	`}`
`1332`	`1338`	`return MaybeDirectHandle<JSPromise>();`
`1333`	`1339`	`}`