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

Unified Diff: src/top.cc

Issue 7970: Reverted r576 as it caused a regression. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 12 years, 2 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/top.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/top.cc
===================================================================
--- src/top.cc (revision 576)
+++ src/top.cc (working copy)
@@ -101,7 +101,7 @@
clear_pending_exception();
clear_scheduled_exception();
thread_local_.save_context_ = NULL;
- thread_local_.pending_external_caught_exception_ = false;
+ thread_local_.catcher_ = NULL;
}
@@ -607,7 +607,7 @@
Failure* Top::ReThrow(Object* exception, MessageLocation* location) {
- // Set the exception being re-thrown.
+ // Set the exception beeing re-thrown.
set_pending_exception(exception);
return Failure::Exception();
}
@@ -789,8 +789,9 @@
// If the exception is caught externally, we store it in the
// try/catch handler. The C code can find it later and process it if
// necessary.
- thread_local_.pending_external_caught_exception_ = is_caught_externally;
+ thread_local_.catcher_ = NULL;
if (is_caught_externally) {
+ thread_local_.catcher_ = thread_local_.try_catch_handler_;
thread_local_.try_catch_handler_->exception_ =
reinterpret_cast<void*>(*exception_handle);
if (!message_obj.is_null()) {
« no previous file with comments | « src/top.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698