diff options
| author | Stephen Belanger <stephen.belanger@datadoghq.com> | 2021-04-22 08:59:36 -0700 |
|---|---|---|
| committer | Stephen Belanger <stephen.belanger@datadoghq.com> | 2021-05-06 15:17:42 -0700 |
| commit | 774874d2d79340189d482f4af88d802462f7707d (patch) | |
| tree | 4fd9b476abb71b79b52819de89c93eca38fba922 /deps/v8/src/builtins/promise-misc.tq | |
| parent | 50dd62ed96e745a087c9289a76721e5f5e0fecbb (diff) | |
| download | node-new-774874d2d79340189d482f4af88d802462f7707d.tar.gz | |
deps: V8: cherry-pick 272445f10927
Original commit message:
[runtime] Fix promise hooks
promiseCapability can be undefined.
Bug: v8:11025
Bug: chromium:1201113
Change-Id: I9da8764820cee0db1f0c38ed2fff0e3afeb9a80e
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2844649
Reviewed-by: Marja Hölttä <marja@chromium.org>
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#74117}
Refs: https://github.com/v8/v8/commit/272445f109273dcdf81d37b1f91f146cfd78ec41
PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'deps/v8/src/builtins/promise-misc.tq')
| -rw-r--r-- | deps/v8/src/builtins/promise-misc.tq | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/deps/v8/src/builtins/promise-misc.tq b/deps/v8/src/builtins/promise-misc.tq index c6661e3717..50e2c8f0de 100644 --- a/deps/v8/src/builtins/promise-misc.tq +++ b/deps/v8/src/builtins/promise-misc.tq @@ -134,7 +134,7 @@ transitioning macro RunContextPromiseHookResolve(implicit context: Context)( @export transitioning macro RunContextPromiseHookBefore(implicit context: Context)( - promiseOrCapability: JSPromise|PromiseCapability) { + promiseOrCapability: JSPromise|PromiseCapability|Undefined) { RunContextPromiseHook( ContextSlot::PROMISE_HOOK_BEFORE_FUNCTION_INDEX, promiseOrCapability, PromiseHookFlags()); @@ -142,7 +142,7 @@ transitioning macro RunContextPromiseHookBefore(implicit context: Context)( @export transitioning macro RunContextPromiseHookBefore(implicit context: Context)( - promiseOrCapability: JSPromise|PromiseCapability, flags: uint32) { + promiseOrCapability: JSPromise|PromiseCapability|Undefined, flags: uint32) { RunContextPromiseHook( ContextSlot::PROMISE_HOOK_BEFORE_FUNCTION_INDEX, promiseOrCapability, flags); @@ -150,7 +150,7 @@ transitioning macro RunContextPromiseHookBefore(implicit context: Context)( @export transitioning macro RunContextPromiseHookAfter(implicit context: Context)( - promiseOrCapability: JSPromise|PromiseCapability) { + promiseOrCapability: JSPromise|PromiseCapability|Undefined) { RunContextPromiseHook( ContextSlot::PROMISE_HOOK_AFTER_FUNCTION_INDEX, promiseOrCapability, PromiseHookFlags()); @@ -158,7 +158,7 @@ transitioning macro RunContextPromiseHookAfter(implicit context: Context)( @export transitioning macro RunContextPromiseHookAfter(implicit context: Context)( - promiseOrCapability: JSPromise|PromiseCapability, flags: uint32) { + promiseOrCapability: JSPromise|PromiseCapability|Undefined, flags: uint32) { RunContextPromiseHook( ContextSlot::PROMISE_HOOK_AFTER_FUNCTION_INDEX, promiseOrCapability, flags); @@ -166,7 +166,7 @@ transitioning macro RunContextPromiseHookAfter(implicit context: Context)( transitioning macro RunContextPromiseHook(implicit context: Context)( slot: Slot<NativeContext, Undefined|JSFunction>, - promiseOrCapability: JSPromise|PromiseCapability, flags: uint32) { + promiseOrCapability: JSPromise|PromiseCapability|Undefined, flags: uint32) { if (!IsContextPromiseHookEnabled(flags)) return; const maybeHook = *NativeContextSlot(slot); if (IsUndefined(maybeHook)) return; @@ -181,6 +181,9 @@ transitioning macro RunContextPromiseHook(implicit context: Context)( case (capability: PromiseCapability): { promise = Cast<JSPromise>(capability.promise) otherwise return; } + case (Undefined): { + return; + } } try { |