Skip to content

Commit 9d7177c

Browse files
Stephen BelangerMylesBorins
Stephen Belanger
authored andcommittedAug 31, 2021
deps: V8: cherry-pick 4c074516397b
Original commit message: [promises] Fix slow path when context promise hooks are present Bug: chromium:1201936 Change-Id: I1ee545e33587ddf4a5c7e1cbd64b53d36c75a146 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2850936 Reviewed-by: Marja Hölttä <marja@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Commit-Queue: Camillo Bruni <cbruni@chromium.org> Cr-Commit-Position: refs/heads/master@{#74267} Refs: v8/v8@4c07451 PR-URL: #36394 Backport-PR-URL: #38577 Reviewed-By: Bryan English <bryan@bryanenglish.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Vladimir de Turckheim <vlad2t@hotmail.com> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent ec0f0ef commit 9d7177c

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed
 

‎common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
# Reset this number to 0 on major V8 upgrades.
3838
# Increment by one for each non-official patch applied to deps/v8.
39-
'v8_embedder_string': '-node.79',
39+
'v8_embedder_string': '-node.80',
4040

4141
##### V8 defaults for Node.js #####
4242

‎deps/v8/src/builtins/promise-jobs.tq

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// https://tc39.es/ecma262/#sec-promise-jobs
88
namespace promise {
99
extern macro IsJSPromiseMap(Map): bool;
10+
extern macro NeedsAnyPromiseHooks(): bool;
1011

1112
// https://tc39.es/ecma262/#sec-promiseresolvethenablejob
1213
transitioning builtin
@@ -25,7 +26,7 @@ PromiseResolveThenableJob(implicit context: Context)(
2526
const promiseThen = nativeContext[NativeContextSlot::PROMISE_THEN_INDEX];
2627
const thenableMap = thenable.map;
2728
if (TaggedEqual(then, promiseThen) && IsJSPromiseMap(thenableMap) &&
28-
!IsIsolatePromiseHookEnabledOrDebugIsActiveOrHasAsyncEventDelegate() &&
29+
!NeedsAnyPromiseHooks() &&
2930
IsPromiseSpeciesLookupChainIntact(nativeContext, thenableMap)) {
3031
// We know that the {thenable} is a JSPromise, which doesn't require
3132
// any special treatment and that {then} corresponds to the initial

‎deps/v8/src/codegen/code-stub-assembler.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -12781,11 +12781,11 @@ TNode<BoolT> CodeStubAssembler::
1278112781
return Word32NotEqual(flags, Int32Constant(0));
1278212782
}
1278312783

12784-
TNode<BoolT> CodeStubAssembler::
12785-
IsAnyPromiseHookEnabledOrHasAsyncEventDelegate(TNode<Uint32T> flags) {
12784+
TNode<BoolT> CodeStubAssembler::NeedsAnyPromiseHooks(TNode<Uint32T> flags) {
1278612785
uint32_t mask = Isolate::PromiseHookFields::HasContextPromiseHook::kMask |
1278712786
Isolate::PromiseHookFields::HasIsolatePromiseHook::kMask |
12788-
Isolate::PromiseHookFields::HasAsyncEventDelegate::kMask;
12787+
Isolate::PromiseHookFields::HasAsyncEventDelegate::kMask |
12788+
Isolate::PromiseHookFields::IsDebugActive::kMask;
1278912789
return IsSetWord32(flags, mask);
1279012790
}
1279112791

‎deps/v8/src/codegen/code-stub-assembler.h

+4-6
Original file line numberDiff line numberDiff line change
@@ -3747,12 +3747,10 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
37473747
return IsAnyPromiseHookEnabledOrDebugIsActiveOrHasAsyncEventDelegate(
37483748
PromiseHookFlags());
37493749
}
3750-
TNode<BoolT> IsAnyPromiseHookEnabledOrHasAsyncEventDelegate(
3751-
TNode<Uint32T> flags);
3752-
TNode<BoolT>
3753-
IsAnyPromiseHookEnabledOrHasAsyncEventDelegate() {
3754-
return IsAnyPromiseHookEnabledOrHasAsyncEventDelegate(
3755-
PromiseHookFlags());
3750+
3751+
TNode<BoolT> NeedsAnyPromiseHooks(TNode<Uint32T> flags);
3752+
TNode<BoolT> NeedsAnyPromiseHooks() {
3753+
return NeedsAnyPromiseHooks(PromiseHookFlags());
37563754
}
37573755

37583756
// for..in helpers

0 commit comments

Comments
 (0)
Please sign in to comment.