Skip to content

Commit a84e9b3

Browse files
Stephen Belangertargos
Stephen Belanger
authored andcommitted
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ä <[email protected]> Reviewed-by: Jakob Gruber <[email protected]> Commit-Queue: Camillo Bruni <[email protected]> Cr-Commit-Position: refs/heads/master@{#74267} Refs: v8/v8@4c07451 PR-URL: #36394 Reviewed-By: Bryan English <[email protected]> Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Vladimir de Turckheim <[email protected]> Reviewed-By: Gerhard Stöbich <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 043b1aa commit a84e9b3

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
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.14',
39+
'v8_embedder_string': '-node.15',
4040

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

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

Lines changed: 2 additions & 1 deletion
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 = *NativeContextSlot(ContextSlot::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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13435,11 +13435,11 @@ TNode<BoolT> CodeStubAssembler::
1343513435
return Word32NotEqual(flags, Int32Constant(0));
1343613436
}
1343713437

13438-
TNode<BoolT> CodeStubAssembler::
13439-
IsAnyPromiseHookEnabledOrHasAsyncEventDelegate(TNode<Uint32T> flags) {
13438+
TNode<BoolT> CodeStubAssembler::NeedsAnyPromiseHooks(TNode<Uint32T> flags) {
1344013439
uint32_t mask = Isolate::PromiseHookFields::HasContextPromiseHook::kMask |
1344113440
Isolate::PromiseHookFields::HasIsolatePromiseHook::kMask |
13442-
Isolate::PromiseHookFields::HasAsyncEventDelegate::kMask;
13441+
Isolate::PromiseHookFields::HasAsyncEventDelegate::kMask |
13442+
Isolate::PromiseHookFields::IsDebugActive::kMask;
1344313443
return IsSetWord32(flags, mask);
1344413444
}
1344513445

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3528,12 +3528,10 @@ class V8_EXPORT_PRIVATE CodeStubAssembler
35283528
return IsAnyPromiseHookEnabledOrDebugIsActiveOrHasAsyncEventDelegate(
35293529
PromiseHookFlags());
35303530
}
3531-
TNode<BoolT> IsAnyPromiseHookEnabledOrHasAsyncEventDelegate(
3532-
TNode<Uint32T> flags);
3533-
TNode<BoolT>
3534-
IsAnyPromiseHookEnabledOrHasAsyncEventDelegate() {
3535-
return IsAnyPromiseHookEnabledOrHasAsyncEventDelegate(
3536-
PromiseHookFlags());
3531+
3532+
TNode<BoolT> NeedsAnyPromiseHooks(TNode<Uint32T> flags);
3533+
TNode<BoolT> NeedsAnyPromiseHooks() {
3534+
return NeedsAnyPromiseHooks(PromiseHookFlags());
35373535
}
35383536

35393537
// for..in helpers

0 commit comments

Comments
 (0)