Revert r11834 because of broken Chromium unit test.

R=yangguo@chromium.org
BUG=v8:2166

Review URL: https://chromiumcodereview.appspot.com/10630003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11892 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 9006c1b2
...@@ -945,12 +945,9 @@ void Isolate::ScheduleThrow(Object* exception) { ...@@ -945,12 +945,9 @@ void Isolate::ScheduleThrow(Object* exception) {
// When scheduling a throw we first throw the exception to get the // When scheduling a throw we first throw the exception to get the
// error reporting if it is uncaught before rescheduling it. // error reporting if it is uncaught before rescheduling it.
Throw(exception); Throw(exception);
PropagatePendingExceptionToExternalTryCatch(); thread_local_top()->scheduled_exception_ = pending_exception();
if (has_pending_exception()) { thread_local_top()->external_caught_exception_ = false;
thread_local_top()->scheduled_exception_ = pending_exception(); clear_pending_exception();
thread_local_top()->external_caught_exception_ = false;
clear_pending_exception();
}
} }
......
...@@ -3363,30 +3363,6 @@ THREADED_TEST(TryCatchAndFinally) { ...@@ -3363,30 +3363,6 @@ THREADED_TEST(TryCatchAndFinally) {
} }
static void TryCatchNestedHelper(int depth) {
if (depth > 0) {
v8::TryCatch try_catch;
try_catch.SetVerbose(true);
TryCatchNestedHelper(depth - 1);
CHECK(try_catch.HasCaught());
try_catch.ReThrow();
} else {
v8::ThrowException(v8_str("back"));
}
}
TEST(TryCatchNested) {
v8::V8::Initialize();
v8::HandleScope scope;
LocalContext context;
v8::TryCatch try_catch;
TryCatchNestedHelper(5);
CHECK(try_catch.HasCaught());
CHECK_EQ(0, strcmp(*v8::String::Utf8Value(try_catch.Exception()), "back"));
}
THREADED_TEST(Equality) { THREADED_TEST(Equality) {
v8::HandleScope scope; v8::HandleScope scope;
LocalContext context; LocalContext context;
......
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