Revert of Create JSPromise

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 {
 namespace internal {
 
 namespace {
@@ skipping 44 matching lines @@
 }
 
 namespace {
 void EnqueuePromiseReactionJob(Isolate* isolate, 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();
   if (isolate->debug()->is_active()) {
     MaybeHandle<Object> maybe_result;
-    Handle<Object> deferred_obj(deferred);
-
-    if (deferred->IsFixedArray()) {
-      deferred_obj = isolate->factory()->undefined_value();
-    }
-
-    Handle<Object> argv[] = {deferred_obj, status};
+    Handle<Object> argv[] = {deferred, 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);
     }
   }
   Handle<PromiseReactionJobInfo> info =
       isolate->factory()->NewPromiseReactionJobInfo(value, tasks, deferred,
                                                     debug_id, debug_name,
                                                     isolate->native_context());
   isolate->EnqueueMicrotask(info);
 }
 
-void PromiseSet(Handle<JSPromise> promise, int status, Handle<Object> result) {
-  promise->set_status(status);
-  promise->set_result(*result);
-  // TODO(gsathya): reset reactions?
-}
-
-void PromiseFulfill(Isolate* isolate, Handle<JSPromise> promise,
-                    Handle<Smi> status, Handle<Object> value) {
-  // Check if there are any callbacks.
-  if (!promise->deferred()->IsUndefined(isolate)) {
-    Handle<Object> tasks((status->value() == kPromiseFulfilled)
-                             ? promise->fulfill_reactions()
-                             : promise->reject_reactions(),
-                         isolate);
-    Handle<Object> deferred(promise->deferred(), isolate);
+void PromiseFulfill(Isolate* isolate, Handle<JSReceiver> promise,
+                    Handle<Smi> status, Handle<Object> value,
+                    Handle<Symbol> reaction) {
+  Handle<Object> tasks = JSReceiver::GetDataProperty(promise, reaction);
+  if (!tasks->IsUndefined(isolate)) {
+    Handle<Object> deferred = JSReceiver::GetDataProperty(
+        promise, isolate->factory()->promise_deferred_reaction_symbol());
     EnqueuePromiseReactionJob(isolate, value, tasks, deferred, status);
   }
-
-  PromiseSet(promise, status->value(), value);
 }
-
 }  // namespace
 
 RUNTIME_FUNCTION(Runtime_PromiseReject) {
   DCHECK(args.length() == 3);
   HandleScope scope(isolate);
-  CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
+  CONVERT_ARG_HANDLE_CHECKED(JSReceiver, promise, 0);
   CONVERT_ARG_HANDLE_CHECKED(Object, reason, 1);
   CONVERT_BOOLEAN_ARG_CHECKED(debug_event, 2);
 
   PromiseRejectEvent(isolate, promise, promise, reason, debug_event);
 
-  Handle<Smi> status(Smi::FromInt(kPromiseRejected), isolate);
-  PromiseFulfill(isolate, promise, status, reason);
+  Handle<Smi> status = handle(Smi::FromInt(kPromiseRejected), isolate);
+  Handle<Symbol> reaction =
+      isolate->factory()->promise_reject_reactions_symbol();
+  PromiseFulfill(isolate, promise, status, reason, reaction);
   return isolate->heap()->undefined_value();
 }
 
 RUNTIME_FUNCTION(Runtime_PromiseFulfill) {
-  DCHECK(args.length() == 3);
+  DCHECK(args.length() == 4);
   HandleScope scope(isolate);
-  CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
+  CONVERT_ARG_HANDLE_CHECKED(JSReceiver, promise, 0);
   CONVERT_ARG_HANDLE_CHECKED(Smi, status, 1);
   CONVERT_ARG_HANDLE_CHECKED(Object, value, 2);
-  PromiseFulfill(isolate, promise, status, value);
+  CONVERT_ARG_HANDLE_CHECKED(Symbol, reaction, 3);
+  PromiseFulfill(isolate, promise, status, value, reaction);
   return isolate->heap()->undefined_value();
 }
 
 RUNTIME_FUNCTION(Runtime_EnqueuePromiseReactionJob) {
   HandleScope scope(isolate);
   DCHECK(args.length() == 4);
   CONVERT_ARG_HANDLE_CHECKED(Object, value, 0);
   CONVERT_ARG_HANDLE_CHECKED(Object, tasks, 1);
   CONVERT_ARG_HANDLE_CHECKED(Object, deferred, 2);
   CONVERT_ARG_HANDLE_CHECKED(Object, status, 3);
@@ skipping 48 matching lines @@
 RUNTIME_FUNCTION(Runtime_RunMicrotasks) {
   HandleScope scope(isolate);
   DCHECK(args.length() == 0);
   isolate->RunMicrotasks();
   return isolate->heap()->undefined_value();
 }
 
 RUNTIME_FUNCTION(Runtime_CreateResolvingFunctions) {
   HandleScope scope(isolate);
   CONVERT_ARG_HANDLE_CHECKED(JSObject, promise, 0);
-  DCHECK(args.length() == 1);
   Handle<JSFunction> resolve, reject;
 
   PromiseUtils::CreateResolvingFunctions(
       isolate, promise, isolate->factory()->true_value(), &resolve, &reject);
 
   Handle<FixedArray> result = isolate->factory()->NewFixedArray(2);
   result->set(0, *resolve);
   result->set(1, *reject);
 
   return *result;
 }
 
-RUNTIME_FUNCTION(Runtime_PromiseStatus) {
-  HandleScope scope(isolate);
-  DCHECK(args.length() == 1);
-  CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
-
-  return Smi::FromInt(promise->status());
-}
-
-RUNTIME_FUNCTION(Runtime_PromiseResult) {
-  HandleScope scope(isolate);
-  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);
-  if (deferred->IsUndefined(isolate)) {
-    return isolate->heap()->undefined_value();
-  }
-
-  if (deferred->IsJSObject()) {
-    return *deferred;
-  }
-
-  DCHECK(deferred->IsFixedArray());
-  return *isolate->factory()->NewJSArrayWithElements(
-      Handle<FixedArray>::cast(deferred));
-}
-
-RUNTIME_FUNCTION(Runtime_PromiseRejectReactions) {
-  HandleScope scope(isolate);
-  DCHECK(args.length() == 1);
-  CONVERT_ARG_HANDLE_CHECKED(JSPromise, promise, 0);
-
-  Handle<Object> reject_reactions(promise->reject_reactions(), isolate);
-  if (reject_reactions->IsUndefined(isolate)) {
-    return isolate->heap()->undefined_value();
-  }
-
-  if (reject_reactions->IsJSObject()) {
-    return *reject_reactions;
-  }
-
-  DCHECK(reject_reactions->IsFixedArray());
-  return *isolate->factory()->NewJSArrayWithElements(
-      Handle<FixedArray>::cast(reject_reactions));
-}
-
 }  // namespace internal
 }  // namespace v8