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

Unified Diff: src/execution.cc

Issue 12901: Reporting uncaught errors at the boundary between C++ and JS instead of tryin... (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 12 years 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
Index: src/execution.cc
===================================================================
--- src/execution.cc (revision 904)
+++ src/execution.cc (working copy)
@@ -95,15 +95,11 @@
*has_pending_exception = value->IsException();
ASSERT(*has_pending_exception == Top::has_pending_exception());
if (*has_pending_exception) {
- Top::setup_external_caught();
- // If the pending exception is OutOfMemoryException set out_of_memory in
- // the global context. Note: We have to mark the global context here
- // since the GenerateThrowOutOfMemory stub cannot make a RuntimeCall to
- // set it.
- if (Top::pending_exception() == Failure::OutOfMemoryException()) {
- Top::context()->mark_out_of_memory();
- }
+ Top::ReportPendingMessages();
return Handle<Object>();
+ } else {
+ Top::clear_pending_message();
Søren Thygesen Gjesse 2008/12/04 07:53:53 If there is no pending exception clearing it shoul
olehougaard 2008/12/04 08:44:35 Removed.
+ Top::setup_external_caught();
Mads Ager (chromium) 2008/12/03 15:44:48 Why is setup_external_caught needed in the case th
olehougaard 2008/12/04 08:44:35 It isn't. Removed.
}
return Handle<Object>(value);

Powered by Google App Engine
This is Rietveld 408576698