Revert "Trigger exception debug event for promises at the throw site."

src/debug.cc

Index: src/debug.cc
diff --git a/src/debug.cc b/src/debug.cc
index ecbc0a12a93cc2c4c207c7f35cf3229f78eced50..0e4e2ad2201eedd85b5e2b0eae5f8111270539a5 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -37,7 +37,6 @@ Debug::Debug(Isolate* isolate)
       disable_break_(false),
       break_on_exception_(false),
       break_on_uncaught_exception_(false),
-      current_promise_catch_handler_(NULL),
       debug_break_return_(NULL),
       debug_break_slot_(NULL),
       isolate_(isolate) {
@@ -1319,53 +1318,6 @@ bool Debug::IsBreakOnException(ExceptionBreakType type) {
 }
 
 
-void Debug::PromiseHandlePrologue(Handle<JSFunction> promise_getter) {
-  ASSERT(current_promise_getter_.is_null());
-  current_promise_getter_ = Handle<JSFunction>::cast(
-      isolate_->global_handles()->Create(*promise_getter));
-  current_promise_catch_handler_ =
-      StackHandler::FromAddress(Isolate::handler(isolate_->thread_local_top()));
-}
-
-
-void Debug::PromiseHandleEpilogue() {
-  current_promise_catch_handler_ = NULL;
-  Handle<Object> promise_getter;
-  if (!current_promise_getter_.ToHandle(&promise_getter)) return;
-  isolate_->global_handles()->Destroy(promise_getter.location());
-  current_promise_getter_ = MaybeHandle<JSFunction>();
-}
-
-
-Handle<Object> Debug::GetPromiseForUncaughtException() {
-  Handle<JSFunction> promise_getter;
-  Handle<Object> undefined = isolate_->factory()->undefined_value();
-  if (current_promise_getter_.ToHandle(&promise_getter)) {
-    // Find the top-most try-catch handler.
-    StackHandler* handler = StackHandler::FromAddress(
-        Isolate::handler(isolate_->thread_local_top()));
-    while (handler != NULL && !handler->is_catch()) {
-      handler = handler->next();
-    }
-#ifdef DEBUG
-    // Make sure that our promise catch handler is in the list of handlers,
-    // even if it's not the top-most try-catch handler.
-    StackHandler* temp = handler;
-    while (temp != current_promise_catch_handler_ && !temp->is_catch()) {
-      temp = temp->next();
-      CHECK(temp != NULL);
-    }
-#endif  // DEBUG
-
-    if (handler == current_promise_catch_handler_) {
-      return Execution::Call(
-          isolate_, promise_getter, undefined, 0, NULL).ToHandleChecked();
-    }
-  }
-  return undefined;
-}
-
-
 void Debug::PrepareStep(StepAction step_action,
                         int step_count,
                         StackFrame::Id frame_id) {
@@ -2695,7 +2647,9 @@ MaybeHandle<Object> Debugger::MakeScriptCollectedEvent(int id) {
 }
 
 
-void Debugger::OnException(Handle<Object> exception, bool uncaught) {
+void Debugger::OnException(Handle<Object> exception,
+                           bool uncaught,
+                           Handle<Object> promise) {
   HandleScope scope(isolate_);
   Debug* debug = isolate_->debug();
 
@@ -2703,9 +2657,6 @@ void Debugger::OnException(Handle<Object> exception, bool uncaught) {
   if (debug->InDebugger()) return;
   if (!Debugger::EventActive(v8::Exception)) return;
 
-  Handle<Object> promise = debug->GetPromiseForUncaughtException();
-  uncaught |= !promise->IsUndefined();
-
   // Bail out if exception breaks are not active
   if (uncaught) {
     // Uncaught exceptions are reported by either flags.
@@ -2723,6 +2674,10 @@ void Debugger::OnException(Handle<Object> exception, bool uncaught) {
   // Clear all current stepping setup.
   debug->ClearStepping();
 
+  // Determine event;
+  DebugEvent event = promise->IsUndefined()
+      ? v8::Exception : v8::PendingExceptionInPromise;
+
   // Create the event data object.
   Handle<Object> event_data;
   // Bail out and don't call debugger if exception.
@@ -2732,7 +2687,7 @@ void Debugger::OnException(Handle<Object> exception, bool uncaught) {
   }
 
   // Process debug event.
-  ProcessDebugEvent(v8::Exception, Handle<JSObject>::cast(event_data), false);
+  ProcessDebugEvent(event, Handle<JSObject>::cast(event_data), false);
   // Return to continue execution from where the exception was thrown.
 }
 
@@ -3214,8 +3169,7 @@ void Debugger::SetMessageHandler(v8::Debug::MessageHandler2 handler) {
 
 
 void Debugger::ListenersChanged() {
-  bool active = IsDebuggerActive();
-  if (active) {
+  if (IsDebuggerActive()) {
     // Disable the compilation cache when the debugger is active.
     isolate_->compilation_cache()->Disable();
     debugger_unload_pending_ = false;