Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5db8b35

Browse filesBrowse files
Qardaddaleax
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 <cbruni@chromium.org> Reviewed-by: Sathya Gunasekaran <gsathya@chromium.org> Commit-Queue: Gus Caplan <me@gus.host> Cr-Commit-Position: refs/heads/master@{#68207} Refs: v8/v8@eec10a2 Backport-PR-URL: #34776 PR-URL: #33778 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
1 parent b7e4d5f commit 5db8b35
Copy full SHA for 5db8b35

File tree

Expand file treeCollapse file tree

3 files changed

+20
-2
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

3 files changed

+20
-2
lines changed
Open diff view settings
Collapse file

‎common.gypi‎

Copy file name to clipboardExpand all lines: common.gypi
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
# Reset this number to 0 on major V8 upgrades.
3636
# Increment by one for each non-official patch applied to deps/v8.
37-
'v8_embedder_string': '-node.42',
37+
'v8_embedder_string': '-node.43',
3838

3939
##### V8 defaults for Node.js #####
4040

Collapse file

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

Copy file name to clipboardExpand all lines: deps/v8/src/builtins/builtins-microtask-queue-gen.cc
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,17 @@ void MicrotaskQueueBuiltinsAssembler::RunSingleMicrotask(
202202
TNode<Object> const thenable = LoadObjectField(
203203
microtask, PromiseResolveThenableJobTask::kThenableOffset);
204204

205+
RunPromiseHook(Runtime::kPromiseHookBefore, microtask_context,
206+
CAST(promise_to_resolve));
207+
205208
TNode<Object> const result =
206209
CallBuiltin(Builtins::kPromiseResolveThenableJob, native_context,
207210
promise_to_resolve, thenable, then);
208211
GotoIfException(result, &if_exception, &var_exception);
212+
213+
RunPromiseHook(Runtime::kPromiseHookAfter, microtask_context,
214+
CAST(promise_to_resolve));
215+
209216
RewindEnteredContext(saved_entered_context_count);
210217
SetCurrentContext(current_context);
211218
Goto(&done);
Collapse file

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

Copy file name to clipboardExpand all lines: deps/v8/test/cctest/test-api.cc
+12-1Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16350,7 +16350,18 @@ TEST(PromiseHook) {
1635016350
CHECK_EQ(v8::Promise::kPending, GetPromise("p")->State());
1635116351
CompileRun("resolve(Promise.resolve(value));\n");
1635216352
CHECK_EQ(v8::Promise::kFulfilled, GetPromise("p")->State());
16353-
CHECK_EQ(9, promise_hook_data->promise_hook_count);
16353+
CHECK_EQ(11, promise_hook_data->promise_hook_count);
16354+
16355+
promise_hook_data->Reset();
16356+
source =
16357+
"var p = Promise.resolve({\n"
16358+
" then(r) {\n"
16359+
" r();\n"
16360+
" }\n"
16361+
"});";
16362+
CompileRun(source);
16363+
CHECK_EQ(GetPromise("p")->State(), v8::Promise::kFulfilled);
16364+
CHECK_EQ(promise_hook_data->promise_hook_count, 5);
1635416365

1635516366
delete promise_hook_data;
1635616367
isolate->SetPromiseHook(nullptr);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.