[promisehook] Pass deferred promise to Before/After callback

src/builtins/builtins-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/builtins/builtins-promise.h"
 #include "src/builtins/builtins-constructor.h"
 #include "src/builtins/builtins-utils.h"
 #include "src/builtins/builtins.h"
 #include "src/code-factory.h"
 #include "src/code-stub-assembler.h"
@@ skipping 551 matching lines @@
     }
 
     Bind(&fulfilled_check);
     {
       Label reject(this);
       Node* const result = LoadObjectField(promise, JSPromise::kResultOffset);
       GotoUnless(WordEqual(status, SmiConstant(v8::Promise::kFulfilled)),
                  &reject);
 
       Node* info = AllocatePromiseReactionJobInfo(
-          promise, result, var_on_resolve.value(), deferred_promise,
-          deferred_on_resolve, deferred_on_reject, context);
+          result, var_on_resolve.value(), deferred_promise, deferred_on_resolve,
+          deferred_on_reject, context);
       // TODO(gsathya): Move this to TF
-      CallRuntime(Runtime::kEnqueuePromiseReactionJob, context, info,
+      CallRuntime(Runtime::kEnqueuePromiseReactionJob, context, promise, info,
                   SmiConstant(v8::Promise::kFulfilled));
       Goto(&out);
 
       Bind(&reject);
       {
         Node* const has_handler = PromiseHasHandler(promise);
         Label enqueue(this);
 
         // TODO(gsathya): Fold these runtime calls and move to TF.
         GotoIf(has_handler, &enqueue);
         CallRuntime(Runtime::kPromiseRevokeReject, context, promise);
         Goto(&enqueue);
 
         Bind(&enqueue);
         {
           Node* info = AllocatePromiseReactionJobInfo(
-              promise, result, var_on_reject.value(), deferred_promise,
+              result, var_on_reject.value(), deferred_promise,
               deferred_on_resolve, deferred_on_reject, context);
           // TODO(gsathya): Move this to TF
-          CallRuntime(Runtime::kEnqueuePromiseReactionJob, context, info,
-                      SmiConstant(v8::Promise::kRejected));
+          CallRuntime(Runtime::kEnqueuePromiseReactionJob, context, promise,
+                      info, SmiConstant(v8::Promise::kRejected));
           Goto(&out);
         }
       }
     }
   }
 
   Bind(&out);
   PromiseSetHasHandler(promise);
   return deferred_promise;
 }
@@ skipping 259 matching lines @@
       status == v8::Promise::kFulfilled
           ? LoadObjectField(promise, JSPromise::kFulfillReactionsOffset)
           : LoadObjectField(promise, JSPromise::kRejectReactionsOffset);
 
   Node* const deferred_on_resolve =
       LoadObjectField(promise, JSPromise::kDeferredOnResolveOffset);
   Node* const deferred_on_reject =
       LoadObjectField(promise, JSPromise::kDeferredOnRejectOffset);
 
   Node* const info = AllocatePromiseReactionJobInfo(
-      promise, result, tasks, deferred_promise, deferred_on_resolve,
-      deferred_on_reject, context);
+      result, tasks, deferred_promise, deferred_on_resolve, deferred_on_reject,
+      context);
 
-  CallRuntime(Runtime::kEnqueuePromiseReactionJob, context, info, status_smi);
+  CallRuntime(Runtime::kEnqueuePromiseReactionJob, context, promise, info,
+              status_smi);
   Goto(&debug_async_event_enqueue_recurring);
 
   Bind(&debug_async_event_enqueue_recurring);
   {
     GotoUnless(IsDebugActive(), &do_promisereset);
     CallRuntime(Runtime::kDebugAsyncEventEnqueueRecurring, context, promise,
                 status_smi);
     Goto(&do_promisereset);
   }
 
@@ skipping 272 matching lines @@
   }
 
   Bind(&if_customhandler);
   {
     CallJS(call_callable, context, on_reject, UndefinedConstant(), exception);
     Return(UndefinedConstant());
   }
 }
 
 TF_BUILTIN(PromiseHandle, PromiseBuiltinsAssembler) {
-  Node* const promise = Parameter(1);
-  Node* const value = Parameter(2);
-  Node* const handler = Parameter(3);
-  Node* const deferred_promise = Parameter(4);
-  Node* const deferred_on_resolve = Parameter(5);
-  Node* const deferred_on_reject = Parameter(6);
-  Node* const context = Parameter(9);
+  Node* const value = Parameter(1);
+  Node* const handler = Parameter(2);
+  Node* const deferred_promise = Parameter(3);
+  Node* const deferred_on_resolve = Parameter(4);
+  Node* const deferred_on_reject = Parameter(5);
+  Node* const context = Parameter(8);
   Isolate* isolate = this->isolate();
 
   Variable var_reason(this, MachineRepresentation::kTagged);
 
   Node* const is_debug_active = IsDebugActive();
   Label run_handler(this), if_rejectpromise(this), promisehook_before(this),
       promisehook_after(this), debug_pop(this);
 
   GotoUnless(is_debug_active, &promisehook_before);
   CallRuntime(Runtime::kDebugPushPromise, context, deferred_promise);
   Goto(&promisehook_before);
 
   Bind(&promisehook_before);
   {
     GotoUnless(IsPromiseHookEnabled(), &run_handler);
-    CallRuntime(Runtime::kPromiseHookBefore, context, promise);
+    CallRuntime(Runtime::kPromiseHookBefore, context, deferred_promise);
     Goto(&run_handler);
   }
 
   Bind(&run_handler);
   {
     Callable call_callable = CodeFactory::Call(isolate);
     Node* const result =
         CallJS(call_callable, context, handler, UndefinedConstant(), value);
 
     GotoIfException(result, &if_rejectpromise, &var_reason);
@@ skipping 20 matching lines @@
   {
     Callable promise_handle_reject = CodeFactory::PromiseHandleReject(isolate);
     CallStub(promise_handle_reject, context, deferred_promise,
              deferred_on_reject, var_reason.value());
     Goto(&promisehook_after);
   }
 
   Bind(&promisehook_after);
   {
     GotoUnless(IsPromiseHookEnabled(), &debug_pop);
-    CallRuntime(Runtime::kPromiseHookAfter, context, promise);
+    CallRuntime(Runtime::kPromiseHookAfter, context, deferred_promise);
     Goto(&debug_pop);
   }
 
   Bind(&debug_pop);
   {
     Label out(this);
 
     GotoUnless(is_debug_active, &out);
     CallRuntime(Runtime::kDebugPopPromise, context);
     Goto(&out);
@@ skipping 203 matching lines @@
 
     // 5. Return promiseCapability.[[Promise]].
     Node* const promise =
         LoadObjectField(capability, JSPromiseCapability::kPromiseOffset);
     Return(promise);
   }
 }
 
 }  // namespace internal
 }  // namespace v8