Change which ExceptionEvents are triggered by Promises

src/runtime/runtime-internal.cc

 // Copyright 2014 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 <memory>
 
 #include "src/arguments.h"
 #include "src/ast/prettyprinter.h"
@@ skipping 256 matching lines @@
   HandleScope scope(isolate);
   DCHECK_EQ(1, args.length());
   CONVERT_ARG_HANDLE_CHECKED(Object, object, 0);
   Handle<String> type = Object::TypeOf(isolate, object);
   THROW_NEW_ERROR_RETURN_FAILURE(
       isolate, NewTypeError(MessageTemplate::kApplyNonFunction, object, type));
 }
 
 
 RUNTIME_FUNCTION(Runtime_PromiseRejectEvent) {
-  DCHECK(args.length() == 3);
+  DCHECK(args.length() == 4);
   HandleScope scope(isolate);
   CONVERT_ARG_HANDLE_CHECKED(JSObject, promise, 0);
   CONVERT_ARG_HANDLE_CHECKED(Object, value, 1);
   CONVERT_BOOLEAN_ARG_CHECKED(debug_event, 2);
-  if (debug_event) isolate->debug()->OnPromiseReject(promise, value);
+  CONVERT_BOOLEAN_ARG_CHECKED(from_promise_reject, 3);

[adamk, 2016/08/23 22:29:27]

Rather than taking a second bool arg, you could split this runtime function into
two and factor the logic out into a helper.

[Dan Ehrenberg, 2016/08/23 23:28:38]

Very good point, done.

+  if (debug_event) {
+    Handle<JSObject> rejected_promise = promise;
+    if (from_promise_reject) {
+      Handle<Object> promise_on_stack = isolate->GetPromiseOnStackOnThrow();
+      if (promise_on_stack->IsJSObject())
+        rejected_promise = Handle<JSObject>::cast(promise_on_stack);
+    }
+    isolate->debug()->OnPromiseReject(rejected_promise, value);
+  }
   Handle<Symbol> key = isolate->factory()->promise_has_handler_symbol();
   // Do not report if we actually have a handler.
   if (JSReceiver::GetDataProperty(promise, key)->IsUndefined(isolate)) {
     isolate->ReportPromiseReject(promise, value,
                                  v8::kPromiseRejectWithNoHandler);
   }
   return isolate->heap()->undefined_value();
 }
 
 
@@ skipping 270 matching lines @@
 
 RUNTIME_FUNCTION(Runtime_Typeof) {
   HandleScope scope(isolate);
   DCHECK_EQ(1, args.length());
   CONVERT_ARG_HANDLE_CHECKED(Object, object, 0);
   return *Object::TypeOf(isolate, object);
 }
 
 }  // namespace internal
 }  // namespace v8