Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1072)

Unified Diff: src/isolate.cc

Issue 296133013: Revert "Make v8::TryCatch able to consume natively thrown exceptions (again)." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/isolate.h ('k') | test/cctest/test-api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
« no previous file with comments | « src/isolate.h ('k') | test/cctest/test-api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698