Trigger exception debug events on Promise reject.

src/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.
 
 "use strict";
 
 // This file relies on the fact that the following declaration has been made
 // in runtime.js:
 // var $Object = global.Object
 // var $WeakMap = global.WeakMap
@@ skipping 11 matching lines @@
 // mirror-debugger.js currently uses builtins.promiseStatus. It would be nice
 // if we could move these property names into the closure below.
 // TODO(jkummerow/rossberg/yangguo): Find a better solution.
 
 // Status values: 0 = pending, +1 = resolved, -1 = rejected
 var promiseStatus = GLOBAL_PRIVATE("Promise#status");
 var promiseValue = GLOBAL_PRIVATE("Promise#value");
 var promiseOnResolve = GLOBAL_PRIVATE("Promise#onResolve");
 var promiseOnReject = GLOBAL_PRIVATE("Promise#onReject");
 var promiseRaw = GLOBAL_PRIVATE("Promise#raw");
+var promiseDebug = GLOBAL_PRIVATE("Promise#debug");
 var lastMicrotaskId = 0;
 
+var PromiseHasRejectHandler;

[rossberg, 2014/08/05 13:35:08]

Nit: move this up to the other Promise* vars.

Though, in fact, better remove all those vars and turn the assignments below
into var statements.

[Yang, 2014/08/06 09:36:23]

Done.

+
 (function() {
 
   var $Promise = function Promise(resolver) {
     if (resolver === promiseRaw) return;
     if (!%_IsConstructCall()) throw MakeTypeError('not_a_promise', [this]);
     if (!IS_SPEC_FUNCTION(resolver))
       throw MakeTypeError('resolver_not_a_function', [resolver]);
     var promise = PromiseInit(this);
     try {
-      %DebugPromiseHandlePrologue(function() { return promise });
+      %DebugPushPromise(promise);
       resolver(function(x) { PromiseResolve(promise, x) },
                function(r) { PromiseReject(promise, r) });
     } catch (e) {
       PromiseReject(promise, e);
     } finally {
-      %DebugPromiseHandleEpilogue();
+      %DebugPopPromise();
     }
   }
 
   // Core functionality.
 
   function PromiseSet(promise, status, value, onResolve, onReject) {
     SET_PRIVATE(promise, promiseStatus, status);
     SET_PRIVATE(promise, promiseValue, value);
     SET_PRIVATE(promise, promiseOnResolve, onResolve);
     SET_PRIVATE(promise, promiseOnReject, onReject);
@@ skipping 31 matching lines @@
           deferred.reject(r);
         }
         return deferred.promise;
       }
     }
     return x;
   }
 
   function PromiseHandle(value, handler, deferred) {
     try {
-      %DebugPromiseHandlePrologue(
-          function() {
-            var queue = GET_PRIVATE(deferred.promise, promiseOnReject);
-            return (queue && queue.length == 0) ? deferred.promise : UNDEFINED;
-          });
+      %DebugPushPromise(deferred.promise);
       var result = handler(value);
       if (result === deferred.promise)
         throw MakeTypeError('promise_cyclic', [result]);
       else if (IsPromise(result))
         %_CallFunction(result, deferred.resolve, deferred.reject, PromiseChain);
       else
         deferred.resolve(result);
     } catch (exception) {
-      try {
-        %DebugPromiseHandlePrologue(function() { return deferred.promise });
-        deferred.reject(exception);
-      } catch (e) { } finally {
-        %DebugPromiseHandleEpilogue();
-      }
+      try { deferred.reject(exception); } catch (e) { }
     } finally {
-      %DebugPromiseHandleEpilogue();
+      %DebugPopPromise();
     }
   }
 
   function PromiseEnqueue(value, tasks, status) {
     var id, name, instrumenting = DEBUG_IS_ACTIVE;
     %EnqueueMicrotask(function() {
       if (instrumenting) {
         %DebugAsyncTaskEvent({ type: "willHandle", id: id, name: name });
       }
       for (var i = 0; i < tasks.length; i += 2) {
@@ skipping 26 matching lines @@
 
   PromiseCreate = function PromiseCreate() {
     return new $Promise(PromiseNopResolver)
   }
 
   PromiseResolve = function PromiseResolve(promise, x) {
     PromiseDone(promise, +1, x, promiseOnResolve)
   }
 
   PromiseReject = function PromiseReject(promise, r) {
+    // Check promiseDebug property to avoid duplicate event.
+    if (DEBUG_IS_ACTIVE && !HAS_PRIVATE(promise, promiseDebug)) {
+      %DebugPromiseRejectEvent(promise, r);
+    }
     PromiseDone(promise, -1, r, promiseOnReject)
   }
 
   // Convenience.
 
   function PromiseDeferred() {
     if (this === $Promise) {
       // Optimized case, avoid extra closure.
       var promise = PromiseInit(new $Promise(promiseRaw));
       return {
@@ skipping 137 matching lines @@
           function(x) { deferred.resolve(x) },
           function(r) { deferred.reject(r) }
         );
       }
     } catch (e) {
       deferred.reject(e)
     }
     return deferred.promise;
   }
 
+
+  // Utility for debugger
+
+  PromiseHasRejectHandler = function PromiseHasRejectHandler() {
+    var queue = GET_PRIVATE(this, promiseOnReject);

[rossberg, 2014/08/05 13:35:08]

Nit: move this line down by 2.

[Yang, 2014/08/06 09:36:23]

Done.

+    // Mark promise as already triggered a reject event.
+    SET_PRIVATE(this, promiseDebug, true);
+    // If already rejected/resolved, the handlers have already been fired.

[rossberg, 2014/08/05 13:35:08]

If the status isn't 0 then the queue should be undefined anyway, so this extra
check shouldn't be needed.

[Yang, 2014/08/06 09:36:23]

Done.

+    if (GET_PRIVATE(this, promiseStatus) !== 0) return true;
+    return queue && queue.length > 0;
+  };
+
   // -------------------------------------------------------------------
   // Install exported functions.
 
   %CheckIsBootstrapping();
   %AddNamedProperty(global, 'Promise', $Promise, DONT_ENUM);
   InstallFunctions($Promise, DONT_ENUM, [
     "defer", PromiseDeferred,
     "accept", PromiseResolved,
     "reject", PromiseRejected,
     "all", PromiseAll,
     "race", PromiseOne,
     "resolve", PromiseCast
   ]);
   InstallFunctions($Promise.prototype, DONT_ENUM, [
     "chain", PromiseChain,
     "then", PromiseThen,
     "catch", PromiseCatch
   ]);
 
 })();