Revert of [promises] Move PromiseReject to c++

src/js/promise.js

 // Copyright 2012 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.
 
 (function(global, utils, extrasUtils) {
 
 "use strict";
 
 %CheckIsBootstrapping();
 
@@ skipping 26 matching lines @@
 var ObjectHasOwnProperty;
 
 utils.Import(function(from) {
   ObjectHasOwnProperty = from.ObjectHasOwnProperty;
   SpeciesConstructor = from.SpeciesConstructor;
 });
 
 // -------------------------------------------------------------------
 
 // [[PromiseState]] values:
-// These values should be kept in sync with PromiseStatus in globals.h
 const kPending = 0;
 const kFulfilled = +1;
-const kRejected = +2;
+const kRejected = -1;
 
 // ES#sec-createresolvingfunctions
 // CreateResolvingFunctions ( promise )
 function CreateResolvingFunctions(promise, debugEvent) {
   var alreadyResolved = false;
 
   // ES#sec-promise-resolve-functions
   // Promise Resolve Functions
   var resolve = value => {
     if (alreadyResolved === true) return;
     alreadyResolved = true;
     ResolvePromise(promise, value);
   };
 
   // ES#sec-promise-reject-functions
   // Promise Reject Functions
   var reject = reason => {
     if (alreadyResolved === true) return;
     alreadyResolved = true;
-    %PromiseReject(promise, reason, debugEvent);
-    PromiseSet(promise, kRejected, reason);
+    RejectPromise(promise, reason, debugEvent);
   };
 
   return {
     __proto__: null,
     resolve: resolve,
     reject: reject
   };
 }
 
 
@@ skipping 70 matching lines @@
     if (IS_UNDEFINED(deferred.resolve)) {
       ResolvePromise(deferred.promise, result);
     } else {
       %_Call(deferred.resolve, UNDEFINED, result);
     }
   } %catch (exception) {  // Natives syntax to mark this catch block.
     try {
       if (IS_UNDEFINED(deferred.reject)) {
         // Pass false for debugEvent so .then chaining does not trigger
         // redundant ExceptionEvents.
-        %PromiseReject(deferred.promise, exception, false);
-        PromiseSet(deferred.promise, kRejected, exception);
+        RejectPromise(deferred.promise, exception, false);
       } else {
         %_Call(deferred.reject, UNDEFINED, exception);
       }
     } catch (e) { }
   } finally {
     if (debug_is_active) %DebugPopPromise();
   }
 }
 
 function PromiseDebugGetInfo(deferreds, status) {
@@ skipping 65 matching lines @@
 }
 
 function PromiseCreate() {
   return PromiseInit(new GlobalPromise(promiseRawSymbol));
 }
 
 // ES#sec-promise-resolve-functions
 // Promise Resolve Functions, steps 6-13
 function ResolvePromise(promise, resolution) {
   if (resolution === promise) {
-    var exception = %make_type_error(kPromiseCyclic, resolution);
-    %PromiseReject(promise, exception, true);
-    PromiseSet(promise, kRejected, exception);
-    return;
+    return RejectPromise(promise,
+                         %make_type_error(kPromiseCyclic, resolution),
+                         true);
   }
   if (IS_RECEIVER(resolution)) {
     // 25.4.1.3.2 steps 8-12
     try {
       var then = resolution.then;
     } catch (e) {
-      %PromiseReject(promise, e, true);
-      PromiseSet(promise, kRejected, e);
-      return;
+      return RejectPromise(promise, e, true);
     }
 
     // Resolution is a native promise and if it's already resolved or
     // rejected, shortcircuit the resolution procedure by directly
     // reusing the value from the promise.
     if (IsPromise(resolution) && then === PromiseThen) {
       var thenableState = GET_PRIVATE(resolution, promiseStateSymbol);
       if (thenableState === kFulfilled) {
         // This goes inside the if-else to save one symbol lookup in
         // the slow path.
         var thenableValue = GET_PRIVATE(resolution, promiseResultSymbol);
         %PromiseFulfill(promise, kFulfilled, thenableValue,
                        promiseFulfillReactionsSymbol);
         PromiseSet(promise, kFulfilled, thenableValue);
         SET_PRIVATE(promise, promiseHasHandlerSymbol, true);
         return;
       } else if (thenableState === kRejected) {
         var thenableValue = GET_PRIVATE(resolution, promiseResultSymbol);
         if (!HAS_DEFINED_PRIVATE(resolution, promiseHasHandlerSymbol)) {
           // Promise has already been rejected, but had no handler.
           // Revoke previously triggered reject event.
           %PromiseRevokeReject(resolution);
         }
         // Don't cause a debug event as this case is forwarding a rejection
-        %PromiseReject(promise, thenableValue, false);
-        PromiseSet(promise, kRejected, thenableValue);
+        RejectPromise(promise, thenableValue, false);
         SET_PRIVATE(resolution, promiseHasHandlerSymbol, true);
         return;
       }
     }
 
     if (IS_CALLABLE(then)) {
       var callbacks = CreateResolvingFunctions(promise, false);
       if (DEBUG_IS_ACTIVE && IsPromise(resolution)) {
           // Mark the dependency of the new promise on the resolution
         SET_PRIVATE(resolution, promiseHandledBySymbol, promise);
       }
       %EnqueuePromiseResolveThenableJob(
           resolution, then, callbacks.resolve, callbacks.reject);
       return;
     }
   }
   %PromiseFulfill(promise, kFulfilled, resolution,
                   promiseFulfillReactionsSymbol);
   PromiseSet(promise, kFulfilled, resolution);
 }
 
-// Only used by async-await.js
-function RejectPromise(promise, reason) {
-  %PromiseReject(promise, reason, false);
+// ES#sec-rejectpromise
+// RejectPromise ( promise, reason )
+function RejectPromise(promise, reason, debugEvent) {
+  // Call runtime for callbacks to the debugger or for unhandled reject.
+  // The debugEvent parameter sets whether a debug ExceptionEvent should
+  // be triggered. It should be set to false when forwarding a rejection
+  // rather than creating a new one.
+  // This check is redundant with checks in the runtime, but it may help
+  // avoid unnecessary runtime calls.
+  if ((debugEvent && DEBUG_IS_ACTIVE) ||
+      !HAS_DEFINED_PRIVATE(promise, promiseHasHandlerSymbol)) {
+    %PromiseRejectEvent(promise, reason, debugEvent);
+  }
+  %PromiseFulfill(promise, kRejected, reason, promiseRejectReactionsSymbol)
   PromiseSet(promise, kRejected, reason);
 }
 
 // Export to bindings
 function DoRejectPromise(promise, reason) {
-  %PromiseReject(promise, reason, true);
-  PromiseSet(promise, kRejected, reason);
+  return RejectPromise(promise, reason, true);
 }
 
 // ES#sec-newpromisecapability
 // NewPromiseCapability ( C )
 function NewPromiseCapability(C, debugEvent) {
   if (C === GlobalPromise) {
     // Optimized case, avoid extra closure.
     var promise = PromiseCreate();
     var callbacks = CreateResolvingFunctions(promise, debugEvent);
     return {
@@ skipping 335 matching lines @@
   to.PromiseThen = PromiseThen;
 
   to.GlobalPromise = GlobalPromise;
   to.NewPromiseCapability = NewPromiseCapability;
   to.PerformPromiseThen = PerformPromiseThen;
   to.ResolvePromise = ResolvePromise;
   to.RejectPromise = RejectPromise;
 });
 
 })