[promises] Remove deferred object

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 42 matching lines @@
   HandleScope scope(isolate);
   CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
   // At this point, no revocation has been issued before
   CHECK(!promise->has_handler());
   isolate->ReportPromiseReject(promise, Handle<Object>(),
                                v8::kPromiseHandlerAddedAfterReject);
   return isolate->heap()->undefined_value();
 }
 
 namespace {
-void EnqueuePromiseReactionJob(Isolate* isolate, Handle<JSPromise> promise,
-                               Handle<Object> value, Handle<Object> tasks,
-                               Handle<Object> deferred, Handle<Object> status) {
-  Handle<Object> debug_id = isolate->factory()->undefined_value();
-  Handle<Object> debug_name = isolate->factory()->undefined_value();
+void EnqueuePromiseReactionJob(Isolate* isolate,
+                               Handle<PromiseReactionJobInfo> info,
+                               Handle<Object> status) {
   if (isolate->debug()->is_active()) {
     MaybeHandle<Object> maybe_result;
-    Handle<Object> deferred_obj(deferred);
+    Handle<Object> deferred_obj(info->deferred_promise(), isolate);
 
-    if (deferred->IsFixedArray()) {
+    if (info->deferred_promise()->IsFixedArray()) {
       deferred_obj = isolate->factory()->undefined_value();
     }
 
     Handle<Object> argv[] = {deferred_obj, status};
     maybe_result = Execution::TryCall(
         isolate, isolate->promise_debug_get_info(),
         isolate->factory()->undefined_value(), arraysize(argv), argv);
 
     Handle<Object> result;
     if ((maybe_result).ToHandle(&result)) {
       CHECK(result->IsJSArray());
       Handle<JSArray> array = Handle<JSArray>::cast(result);
       ElementsAccessor* accessor = array->GetElementsAccessor();
       DCHECK(accessor->HasElement(array, 0));
       DCHECK(accessor->HasElement(array, 1));
-      debug_id = accessor->Get(array, 0);
-      debug_name = accessor->Get(array, 1);
+      info->set_debug_id(*accessor->Get(array, 0));
+      info->set_debug_name(*accessor->Get(array, 1));
     }
   }
-  Handle<PromiseReactionJobInfo> info =
-      isolate->factory()->NewPromiseReactionJobInfo(
-          promise, value, tasks, deferred, debug_id, debug_name,
-          isolate->native_context());
   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(isolate->heap()->undefined_value());
+  promise->set_deferred_promise(isolate->heap()->undefined_value());
+  promise->set_deferred_on_resolve(isolate->heap()->undefined_value());
+  promise->set_deferred_on_reject(isolate->heap()->undefined_value());
   promise->set_fulfill_reactions(isolate->heap()->undefined_value());
   promise->set_reject_reactions(isolate->heap()->undefined_value());
 }
 
 void PromiseFulfill(Isolate* isolate, Handle<JSPromise> promise,
                     Handle<Smi> status, Handle<Object> value) {
   // Check if there are any callbacks.
-  if (!promise->deferred()->IsUndefined(isolate)) {
+  if (!promise->deferred_promise()->IsUndefined(isolate)) {
     Handle<Object> tasks((status->value() == v8::Promise::kFulfilled)
                              ? promise->fulfill_reactions()
                              : promise->reject_reactions(),
                          isolate);
-    Handle<Object> deferred(promise->deferred(), isolate);
-    EnqueuePromiseReactionJob(isolate, promise, value, tasks, deferred, status);
+    Handle<PromiseReactionJobInfo> info =
+        isolate->factory()->NewPromiseReactionJobInfo(
+            promise, 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);
   }
 
   PromiseSet(isolate, promise, status->value(), value);
 }
 
 }  // namespace
 
 RUNTIME_FUNCTION(Runtime_PromiseReject) {
   DCHECK(args.length() == 3);
   HandleScope scope(isolate);
@@ skipping 13 matching lines @@
   HandleScope scope(isolate);
   CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
   CONVERT_ARG_HANDLE_CHECKED(Smi, status, 1);
   CONVERT_ARG_HANDLE_CHECKED(Object, value, 2);
   PromiseFulfill(isolate, promise, status, value);
   return isolate->heap()->undefined_value();
 }
 
 RUNTIME_FUNCTION(Runtime_EnqueuePromiseReactionJob) {
   HandleScope scope(isolate);
-  DCHECK(args.length() == 5);
-  CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
-  CONVERT_ARG_HANDLE_CHECKED(Object, value, 1);
-  CONVERT_ARG_HANDLE_CHECKED(Object, tasks, 2);
-  CONVERT_ARG_HANDLE_CHECKED(Object, deferred, 3);
-  CONVERT_ARG_HANDLE_CHECKED(Object, status, 4);
-  EnqueuePromiseReactionJob(isolate, promise, value, tasks, deferred, status);
+  DCHECK(args.length() == 2);
+  CONVERT_ARG_HANDLE_CHECKED(PromiseReactionJobInfo, info, 0);
+  CONVERT_ARG_HANDLE_CHECKED(Object, status, 1);
+  EnqueuePromiseReactionJob(isolate, info, status);
   return isolate->heap()->undefined_value();
 }
 
 RUNTIME_FUNCTION(Runtime_EnqueuePromiseResolveThenableJob) {
   HandleScope scope(isolate);
   DCHECK(args.length() == 3);
   CONVERT_ARG_HANDLE_CHECKED(JSObject, promise, 0);
   CONVERT_ARG_HANDLE_CHECKED(JSReceiver, resolution, 1);
   CONVERT_ARG_HANDLE_CHECKED(JSReceiver, then, 2);
 
@@ skipping 70 matching lines @@
   DCHECK(args.length() == 1);
   CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
   return promise->result();
 }
 
 RUNTIME_FUNCTION(Runtime_PromiseDeferred) {
   HandleScope scope(isolate);
   DCHECK(args.length() == 1);
   CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
 
-  Handle<Object> deferred(promise->deferred(), isolate);
+  Handle<Object> deferred(promise->deferred_promise(), isolate);
   if (deferred->IsUndefined(isolate)) {
     return isolate->heap()->undefined_value();
   }
 
   if (deferred->IsJSObject()) {
     return *deferred;
   }
 
   DCHECK(deferred->IsFixedArray());
   return *isolate->factory()->NewJSArrayWithElements(
@@ skipping 68 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