Reviewers: Mads Ager,
Message:
Mads,
a tiny CL for you.
Description:
Better name for ShouldReturnException which actually should be
ShouldReportException.
Please review this at http://codereview.chromium.org/6368019/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/top.h
M src/top.cc
Index: src/top.cc
diff --git a/src/top.cc b/src/top.cc
index
e99702d17e7d40376eda88b1da427c83f4b965e5..e32eb6bc8b2677b64db262582b9c48c112d4033b
100644
--- a/src/top.cc
+++ b/src/top.cc
@@ -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) {
// Find the top-most try-catch handler.
StackHandler* handler =
@@ -847,15 +847,15 @@ void Top::DoThrow(MaybeObject* exception,
Handle<Object> exception_handle(exception_object);
// Determine reporting and whether the exception is caught externally.
- bool is_caught_externally = false;
bool is_out_of_memory = exception == Failure::OutOfMemoryException();
bool is_termination_exception = exception ==
Heap::termination_exception();
bool catchable_by_javascript = !is_termination_exception
&& !is_out_of_memory;
// Only real objects can be caught by JS.
ASSERT(!catchable_by_javascript || is_object);
- bool should_return_exception =
- ShouldReturnException(&is_caught_externally,
catchable_by_javascript);
- bool report_exception = catchable_by_javascript &&
should_return_exception;
+ bool is_caught_externally = false;
+ bool should_report_exception =
+ ShouldReportException(&is_caught_externally,
catchable_by_javascript);
+ bool report_exception = catchable_by_javascript &&
should_report_exception;
#ifdef ENABLE_DEBUGGER_SUPPORT
// Notify debugger of exception.
Index: src/top.h
diff --git a/src/top.h b/src/top.h
index
ea8eddf6b26c542bc2534c7a7fcda42eeb3b5f2c..5b0fd6157cbd4da5c822e1442ea47824a4eecf85
100644
--- a/src/top.h
+++ b/src/top.h
@@ -386,7 +386,9 @@ class Top {
static void DoThrow(MaybeObject* exception,
MessageLocation* location,
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);
// Attempts to compute the current source location, storing the
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
