Commit 67f3a0e7 authored by antonm@chromium.org's avatar antonm@chromium.org

Better name for ShouldReturnException which actually should be ShouldReportException.

Review URL: http://codereview.chromium.org/6368019

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@6515 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent d82332eb
...@@ -806,7 +806,7 @@ void Top::ComputeLocation(MessageLocation* target) { ...@@ -806,7 +806,7 @@ void Top::ComputeLocation(MessageLocation* target) {
} }
bool Top::ShouldReturnException(bool* is_caught_externally, bool Top::ShouldReportException(bool* is_caught_externally,
bool catchable_by_javascript) { bool catchable_by_javascript) {
// Find the top-most try-catch handler. // Find the top-most try-catch handler.
StackHandler* handler = StackHandler* handler =
...@@ -847,15 +847,15 @@ void Top::DoThrow(MaybeObject* exception, ...@@ -847,15 +847,15 @@ void Top::DoThrow(MaybeObject* exception,
Handle<Object> exception_handle(exception_object); Handle<Object> exception_handle(exception_object);
// Determine reporting and whether the exception is caught externally. // Determine reporting and whether the exception is caught externally.
bool is_caught_externally = false;
bool is_out_of_memory = exception == Failure::OutOfMemoryException(); bool is_out_of_memory = exception == Failure::OutOfMemoryException();
bool is_termination_exception = exception == Heap::termination_exception(); bool is_termination_exception = exception == Heap::termination_exception();
bool catchable_by_javascript = !is_termination_exception && !is_out_of_memory; bool catchable_by_javascript = !is_termination_exception && !is_out_of_memory;
// Only real objects can be caught by JS. // Only real objects can be caught by JS.
ASSERT(!catchable_by_javascript || is_object); ASSERT(!catchable_by_javascript || is_object);
bool should_return_exception = bool is_caught_externally = false;
ShouldReturnException(&is_caught_externally, catchable_by_javascript); bool should_report_exception =
bool report_exception = catchable_by_javascript && should_return_exception; ShouldReportException(&is_caught_externally, catchable_by_javascript);
bool report_exception = catchable_by_javascript && should_report_exception;
#ifdef ENABLE_DEBUGGER_SUPPORT #ifdef ENABLE_DEBUGGER_SUPPORT
// Notify debugger of exception. // Notify debugger of exception.
......
...@@ -386,7 +386,9 @@ class Top { ...@@ -386,7 +386,9 @@ class Top {
static void DoThrow(MaybeObject* exception, static void DoThrow(MaybeObject* exception,
MessageLocation* location, MessageLocation* location,
const char* message); const char* message);
static bool ShouldReturnException(bool* is_caught_externally, // Checks if exception should be reported and finds out if it's
// caught externally.
static bool ShouldReportException(bool* is_caught_externally,
bool catchable_by_javascript); bool catchable_by_javascript);
// Attempts to compute the current source location, storing the // Attempts to compute the current source location, storing the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment