[promisehook] Pass deferred promise to Before/After callback

src/runtime/runtime-promise.cc

 // Copyright 2016 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.
 #include "src/runtime/runtime-utils.h"
 
 #include "src/debug/debug.h"
 #include "src/elements.h"
 #include "src/promise-utils.h"
 
 namespace v8 {
@@ skipping 92 matching lines @@
 
   // id can be Undefined or Smi.
   if (!id->IsSmi()) {
     return false;
   }
 
   *debug_id = Handle<Smi>::cast(id)->value();
   return true;
 }
 
-void SetDebugInfo(Isolate* isolate, Handle<PromiseReactionJobInfo> info,
-                  int status) {
+void SetDebugInfo(Isolate* isolate, Handle<JSPromise> promise,
+                  Handle<PromiseReactionJobInfo> info, int status) {
   int id;
   PromiseDebugActionName name;
 
   if (GetDebugIdForAsyncFunction(isolate, info, &id)) {
     name = kDebugAsyncFunction;
   } else {
-    id = isolate->debug()->NextAsyncTaskId(handle(info->promise(), isolate));
+    id = isolate->debug()->NextAsyncTaskId(promise);
     DCHECK(status != v8::Promise::kPending);
     name = status == v8::Promise::kFulfilled ? kDebugPromiseResolve
                                              : kDebugPromiseReject;
   }
 
   info->set_debug_id(id);
   info->set_debug_name(name);
 }
 
-void EnqueuePromiseReactionJob(Isolate* isolate,
+void EnqueuePromiseReactionJob(Isolate* isolate, Handle<JSPromise> promise,
                                Handle<PromiseReactionJobInfo> info,
                                int status) {
   if (isolate->debug()->is_active()) {
-    SetDebugInfo(isolate, info, status);
+    SetDebugInfo(isolate, promise, info, status);
   }
 
   isolate->EnqueueMicrotask(info);
 }
 
 void PromiseSet(Isolate* isolate, Handle<JSPromise> promise, int status,
                 Handle<Object> result) {
   promise->set_status(status);
   promise->set_result(*result);
   promise->set_deferred_promise(isolate->heap()->undefined_value());
@@ skipping 13 matching lines @@
                                           : kDebugPromiseReject);
   }
   // Check if there are any callbacks.
   if (!promise->deferred_promise()->IsUndefined(isolate)) {
     Handle<Object> tasks((status == v8::Promise::kFulfilled)
                              ? promise->fulfill_reactions()
                              : promise->reject_reactions(),
                          isolate);
     Handle<PromiseReactionJobInfo> info =
         isolate->factory()->NewPromiseReactionJobInfo(
-            promise, value, tasks, handle(promise->deferred_promise(), isolate),
+            value, tasks, handle(promise->deferred_promise(), isolate),
             handle(promise->deferred_on_resolve(), isolate),
             handle(promise->deferred_on_reject(), isolate),
             isolate->native_context());
-    EnqueuePromiseReactionJob(isolate, info, status);
+    EnqueuePromiseReactionJob(isolate, promise, info, status);
   }
 
   PromiseSet(isolate, promise, status, value);
 }
 
 }  // namespace
 
 RUNTIME_FUNCTION(Runtime_PromiseReject) {
   DCHECK_EQ(3, args.length());
   HandleScope scope(isolate);
   CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
   CONVERT_ARG_HANDLE_CHECKED(Object, reason, 1);
   CONVERT_BOOLEAN_ARG_CHECKED(debug_event, 2);
 
   PromiseRejectEvent(isolate, promise, promise, reason, debug_event);
   PromiseFulfill(isolate, promise, v8::Promise::kRejected, reason);
 
   return isolate->heap()->undefined_value();
 }
 
 RUNTIME_FUNCTION(Runtime_EnqueuePromiseReactionJob) {
   HandleScope scope(isolate);
-  DCHECK_EQ(2, args.length());
-  CONVERT_ARG_HANDLE_CHECKED(PromiseReactionJobInfo, info, 0);
-  CONVERT_SMI_ARG_CHECKED(status, 1);
-  EnqueuePromiseReactionJob(isolate, info, status);
+  DCHECK_EQ(3, args.length());
+  CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
+  CONVERT_ARG_HANDLE_CHECKED(PromiseReactionJobInfo, info, 1);
+  CONVERT_SMI_ARG_CHECKED(status, 2);
+  EnqueuePromiseReactionJob(isolate, promise, info, status);
   return isolate->heap()->undefined_value();
 }
 
 RUNTIME_FUNCTION(Runtime_EnqueuePromiseResolveThenableJob) {
   HandleScope scope(isolate);
   DCHECK(args.length() == 1);
   CONVERT_ARG_HANDLE_CHECKED(PromiseResolveThenableJobInfo, info, 0);
   isolate->EnqueueMicrotask(info);
   return isolate->heap()->undefined_value();
 }
@@ skipping 77 matching lines @@
   HandleScope scope(isolate);
   DCHECK_EQ(1, args.length());
   CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
   isolate->RunPromiseHook(PromiseHookType::kAfter, promise,
                           isolate->factory()->undefined_value());
   return isolate->heap()->undefined_value();
 }
 
 }  // namespace internal
 }  // namespace v8