Commit a84e9b3
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
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 043b1aa commit a84e9b3
4 files changed
Lines changed: 10 additions & 11 deletions
File tree
- deps/v8/src
- builtins
- codegen
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | 37 | # Reset this number to 0 on major V8 upgrades. | |
| 38 | 38 | # Increment by one for each non-official patch applied to deps/v8. | |
| 39 | - 'v8_embedder_string': '-node.14', | ||
| 39 | + 'v8_embedder_string': '-node.15', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,6 +7,7 @@ | |||
| 7 | 7 | // https://tc39.es/ecma262/#sec-promise-jobs | |
| 8 | 8 | namespace promise { | |
| 9 | 9 | extern macro IsJSPromiseMap(Map): bool; | |
| 10 | + extern macro NeedsAnyPromiseHooks(): bool; | ||
| 10 | 11 | ||
| 11 | 12 | // https://tc39.es/ecma262/#sec-promiseresolvethenablejob | |
| 12 | 13 | transitioning builtin | |
@@ -25,7 +26,7 @@ PromiseResolveThenableJob(implicit context: Context)( | |||
| 25 | 26 | const promiseThen = *NativeContextSlot(ContextSlot::PROMISE_THEN_INDEX); | |
| 26 | 27 | const thenableMap = thenable.map; | |
| 27 | 28 | if (TaggedEqual(then, promiseThen) && IsJSPromiseMap(thenableMap) && | |
| 28 | - !IsIsolatePromiseHookEnabledOrDebugIsActiveOrHasAsyncEventDelegate() && | ||
| 29 | + !NeedsAnyPromiseHooks() && | ||
| 29 | 30 | IsPromiseSpeciesLookupChainIntact(nativeContext, thenableMap)) { | |
| 30 | 31 | // We know that the {thenable} is a JSPromise, which doesn't require | |
| 31 | 32 | // any special treatment and that {then} corresponds to the initial | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13435,11 +13435,11 @@ TNode<BoolT> CodeStubAssembler:: | |||
| 13435 | 13435 | return Word32NotEqual(flags, Int32Constant(0)); | |
| 13436 | 13436 | } | |
| 13437 | 13437 | ||
| 13438 | - TNode<BoolT> CodeStubAssembler:: | ||
| 13439 | - IsAnyPromiseHookEnabledOrHasAsyncEventDelegate(TNode<Uint32T> flags) { | ||
| 13438 | + TNode<BoolT> CodeStubAssembler::NeedsAnyPromiseHooks(TNode<Uint32T> flags) { | ||
| 13440 | 13439 | uint32_t mask = Isolate::PromiseHookFields::HasContextPromiseHook::kMask | | |
| 13441 | 13440 | Isolate::PromiseHookFields::HasIsolatePromiseHook::kMask | | |
| 13442 | - Isolate::PromiseHookFields::HasAsyncEventDelegate::kMask; | ||
| 13441 | + Isolate::PromiseHookFields::HasAsyncEventDelegate::kMask | | ||
| 13442 | + Isolate::PromiseHookFields::IsDebugActive::kMask; | ||
| 13443 | 13443 | return IsSetWord32(flags, mask); | |
| 13444 | 13444 | } | |
| 13445 | 13445 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3528,12 +3528,10 @@ class V8_EXPORT_PRIVATE CodeStubAssembler | |||
| 3528 | 3528 | return IsAnyPromiseHookEnabledOrDebugIsActiveOrHasAsyncEventDelegate( | |
| 3529 | 3529 | PromiseHookFlags()); | |
| 3530 | 3530 | } | |
| 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()); | ||
| 3537 | 3535 | } | |
| 3538 | 3536 | ||
| 3539 | 3537 | // for..in helpers | |
0 commit comments