Index: src/isolate.cc |
diff --git a/src/isolate.cc b/src/isolate.cc |
index 08948fcc3fde66856a2d8ad7bd100f6281462455..9572046a40e01274aeafa9b626ed6c77b48130c7 100644 |
--- a/src/isolate.cc |
+++ b/src/isolate.cc |
@@ -908,15 +908,6 @@ void Isolate::RestorePendingMessageFromTryCatch(v8::TryCatch* handler) { |
} |
-void Isolate::CancelScheduledExceptionFromTryCatch(v8::TryCatch* handler) { |
- ASSERT(has_scheduled_exception()); |
- if (scheduled_exception() == handler->exception_) { |
- ASSERT(scheduled_exception() != heap()->termination_exception()); |
- clear_scheduled_exception(); |
- } |
-} |
- |
- |
Object* Isolate::PromoteScheduledException() { |
Object* thrown = scheduled_exception(); |
clear_scheduled_exception(); |
@@ -1222,7 +1213,8 @@ void Isolate::ReportPendingMessages() { |
PropagatePendingExceptionToExternalTryCatch(); |
HandleScope scope(this); |
- if (thread_local_top_.pending_exception_ == heap()->termination_exception()) { |
+ if (thread_local_top_.pending_exception_ == |
+ heap()->termination_exception()) { |
// Do nothing: if needed, the exception has been already propagated to |
// v8::TryCatch. |
} else { |
@@ -1759,7 +1751,8 @@ void Isolate::PropagatePendingExceptionToExternalTryCatch() { |
if (!external_caught) return; |
- if (thread_local_top_.pending_exception_ == heap()->termination_exception()) { |
+ if (thread_local_top_.pending_exception_ == |
+ heap()->termination_exception()) { |
try_catch_handler()->can_continue_ = false; |
try_catch_handler()->has_terminated_ = true; |
try_catch_handler()->exception_ = heap()->null_value(); |