Skip to content

Commit 162092e

Browse files
Qardcodebytere
authored andcommitted
deps: V8: cherry-pick eec10a2fd8fa
Original commit message: [promisehook] Add before/after hooks to thenable tasks This will allow Node.js to properly track async context in thenables. Change-Id: If441423789a78307a57ad7e645daabf551cddb57 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2215624 Reviewed-by: Camillo Bruni <[email protected]> Reviewed-by: Sathya Gunasekaran <[email protected]> Commit-Queue: Gus Caplan <[email protected]> Cr-Commit-Position: refs/heads/master@{#68207} Refs: v8/v8@eec10a2 PR-URL: #33778 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Gerhard Stöbich <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
1 parent 61de26a commit 162092e

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

deps/v8/src/builtins/builtins-microtask-queue-gen.cc

+7
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,18 @@ void MicrotaskQueueBuiltinsAssembler::RunSingleMicrotask(
198198
const TNode<Object> thenable = LoadObjectField(
199199
microtask, PromiseResolveThenableJobTask::kThenableOffset);
200200

201+
RunPromiseHook(Runtime::kPromiseHookBefore, microtask_context,
202+
CAST(promise_to_resolve));
203+
201204
{
202205
ScopedExceptionHandler handler(this, &if_exception, &var_exception);
203206
CallBuiltin(Builtins::kPromiseResolveThenableJob, native_context,
204207
promise_to_resolve, thenable, then);
205208
}
209+
210+
RunPromiseHook(Runtime::kPromiseHookAfter, microtask_context,
211+
CAST(promise_to_resolve));
212+
206213
RewindEnteredContext(saved_entered_context_count);
207214
SetCurrentContext(current_context);
208215
Goto(&done);

deps/v8/test/cctest/test-api.cc

+12-1
Original file line numberDiff line numberDiff line change
@@ -16357,7 +16357,18 @@ TEST(PromiseHook) {
1635716357
CHECK_EQ(v8::Promise::kPending, GetPromise("p")->State());
1635816358
CompileRun("resolve(Promise.resolve(value));\n");
1635916359
CHECK_EQ(v8::Promise::kFulfilled, GetPromise("p")->State());
16360-
CHECK_EQ(9, promise_hook_data->promise_hook_count);
16360+
CHECK_EQ(11, promise_hook_data->promise_hook_count);
16361+
16362+
promise_hook_data->Reset();
16363+
source =
16364+
"var p = Promise.resolve({\n"
16365+
" then(r) {\n"
16366+
" r();\n"
16367+
" }\n"
16368+
"});";
16369+
CompileRun(source);
16370+
CHECK_EQ(GetPromise("p")->State(), v8::Promise::kFulfilled);
16371+
CHECK_EQ(promise_hook_data->promise_hook_count, 5);
1636116372

1636216373
delete promise_hook_data;
1636316374
isolate->SetPromiseHook(nullptr);

0 commit comments

Comments
 (0)