[runtime] Fix promise hooks

camillobruni · Commit Bot · commit 272445f10927 · 2021-04-22T09:02:11.000Z
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}
diff --git a/src/builtins/promise-misc.tq b/src/builtins/promise-misc.tq
@@ -134,39 +134,39 @@ 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());
 }
 
 @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);
 }
 
 @export
 transitioning macro RunContextPromiseHookAfter(implicit context: Context)(
-    promiseOrCapability: JSPromise|PromiseCapability) {
+    promiseOrCapability: JSPromise|PromiseCapability|Undefined) {
   RunContextPromiseHook(
       ContextSlot::PROMISE_HOOK_AFTER_FUNCTION_INDEX, promiseOrCapability,
       PromiseHookFlags());
 }
 
 @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);
 }
 
 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 {
diff --git a/test/mjsunit/promise-hooks.js b/test/mjsunit/promise-hooks.js
@@ -1,7 +1,7 @@
 // Copyright 2020 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
+
 // Flags: --allow-natives-syntax --opt --no-always-opt --no-stress-opt --deopt-every-n-times=0 --ignore-unhandled-promises
 
 let log = [];
@@ -242,3 +242,13 @@ optimizerBailout(async () => {
 });
 basicTest();
 exceptions();
+
+(function regress1126309() {
+  function __f_16(test) {
+    test();
+    d8.promise.setHooks( undefined, () => {});
+    %PerformMicrotaskCheckpoint();
+    d8.promise.setHooks();
+  }
+  __f_16(async () => { await Promise.resolve()});
+})();
