Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorStephen Belanger <admin@stephenbelanger.com>2020-06-07 00:13:16 +0300
committerJames M Snell <jasnell@gmail.com>2020-06-19 06:52:45 +0300
commit56967afdcab0b3c2dbcd120a0a761a041961754d (patch)
tree8dfc77b3b2fa418e8bccaedf60a3fe55949fffd6 /deps
parentddfed6916829aa56814e3d8b125d59d61cf4bd4b (diff)
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: https://github.com/v8/v8/commit/eec10a2fd8fa4d0e7f5e32dedbd239d938a5dd87 PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'deps')
-rw-r--r--deps/v8/src/builtins/builtins-microtask-queue-gen.cc7
-rw-r--r--deps/v8/test/cctest/test-api.cc13
2 files changed, 19 insertions, 1 deletions
diff --git a/deps/v8/src/builtins/builtins-microtask-queue-gen.cc b/deps/v8/src/builtins/builtins-microtask-queue-gen.cc
index 917255f9bb3..c71faa116c1 100644
--- a/deps/v8/src/builtins/builtins-microtask-queue-gen.cc
+++ b/deps/v8/src/builtins/builtins-microtask-queue-gen.cc
@@ -198,11 +198,18 @@ void MicrotaskQueueBuiltinsAssembler::RunSingleMicrotask(
const TNode<Object> thenable = LoadObjectField(
microtask, PromiseResolveThenableJobTask::kThenableOffset);
+ RunPromiseHook(Runtime::kPromiseHookBefore, microtask_context,
+ CAST(promise_to_resolve));
+
{
ScopedExceptionHandler handler(this, &if_exception, &var_exception);
CallBuiltin(Builtins::kPromiseResolveThenableJob, native_context,
promise_to_resolve, thenable, then);
}
+
+ RunPromiseHook(Runtime::kPromiseHookAfter, microtask_context,
+ CAST(promise_to_resolve));
+
RewindEnteredContext(saved_entered_context_count);
SetCurrentContext(current_context);
Goto(&done);
diff --git a/deps/v8/test/cctest/test-api.cc b/deps/v8/test/cctest/test-api.cc
index 6b7ea85452d..a12d4788e4b 100644
--- a/deps/v8/test/cctest/test-api.cc
+++ b/deps/v8/test/cctest/test-api.cc
@@ -16357,7 +16357,18 @@ TEST(PromiseHook) {
CHECK_EQ(v8::Promise::kPending, GetPromise("p")->State());
CompileRun("resolve(Promise.resolve(value));\n");
CHECK_EQ(v8::Promise::kFulfilled, GetPromise("p")->State());
- CHECK_EQ(9, promise_hook_data->promise_hook_count);
+ CHECK_EQ(11, promise_hook_data->promise_hook_count);
+
+ promise_hook_data->Reset();
+ source =
+ "var p = Promise.resolve({\n"
+ " then(r) {\n"
+ " r();\n"
+ " }\n"
+ "});";
+ CompileRun(source);
+ CHECK_EQ(GetPromise("p")->State(), v8::Promise::kFulfilled);
+ CHECK_EQ(promise_hook_data->promise_hook_count, 5);
delete promise_hook_data;
isolate->SetPromiseHook(nullptr);