Revision: 11892
Author: [email protected]
Date: Thu Jun 21 04:10:53 2012
Log: Revert r11834 because of broken Chromium unit test.
[email protected]
BUG=v8:2166
Review URL: https://chromiumcodereview.appspot.com/10630003
http://code.google.com/p/v8/source/detail?r=11892
Modified:
/branches/bleeding_edge/src/isolate.cc
/branches/bleeding_edge/test/cctest/test-api.cc
=======================================
--- /branches/bleeding_edge/src/isolate.cc Wed Jun 20 01:58:41 2012
+++ /branches/bleeding_edge/src/isolate.cc Thu Jun 21 04:10:53 2012
@@ -945,12 +945,9 @@
// When scheduling a throw we first throw the exception to get the
// error reporting if it is uncaught before rescheduling it.
Throw(exception);
- PropagatePendingExceptionToExternalTryCatch();
- if (has_pending_exception()) {
- thread_local_top()->scheduled_exception_ = pending_exception();
- thread_local_top()->external_caught_exception_ = false;
- clear_pending_exception();
- }
+ thread_local_top()->scheduled_exception_ = pending_exception();
+ thread_local_top()->external_caught_exception_ = false;
+ clear_pending_exception();
}
=======================================
--- /branches/bleeding_edge/test/cctest/test-api.cc Wed Jun 20 09:07:30 2012
+++ /branches/bleeding_edge/test/cctest/test-api.cc Thu Jun 21 04:10:53 2012
@@ -3361,30 +3361,6 @@
"}\n");
CHECK(try_catch.HasCaught());
}
-
-
-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) {
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
