[v8-dev] [v8] r21427 committed - Make v8::TryCatch able to consume natively thrown exceptions....

[codesite-noreply via v8-dev]

Revision: 21427
Author:   mstarzin...@chromium.org
Date:     Thu May 22 08:46:01 2014 UTC
Log:      Make v8::TryCatch able to consume natively thrown exceptions.
R=yang...@chromium.org, hara...@chromium.org
BUG=chromium:362388
TEST=cctest/test-api/TryCatchNative
LOG=N

Review URL: https://codereview.chromium.org/287133005
http://code.google.com/p/v8/source/detail?r=21427

Modified:
 /branches/bleeding_edge/src/isolate.cc
 /branches/bleeding_edge/test/cctest/test-api.cc

=======================================
--- /branches/bleeding_edge/src/isolate.cc      Tue May 20 10:13:46 2014 UTC
+++ /branches/bleeding_edge/src/isolate.cc      Thu May 22 08:46:01 2014 UTC
@@ -883,7 +883,7 @@
   // When scheduling a throw we first throw the exception to get the
   // error reporting if it is uncaught before rescheduling it.
   Throw(exception);
-  PropagatePendingExceptionToExternalTryCatch();
+  OptionalRescheduleException(false);
   if (has_pending_exception()) {
     thread_local_top()->scheduled_exception_ = pending_exception();
     thread_local_top()->external_caught_exception_ = false;
=======================================
--- /branches/bleeding_edge/test/cctest/test-api.cc	Wed May 21 09:49:18  
2014 UTC
+++ /branches/bleeding_edge/test/cctest/test-api.cc	Thu May 22 08:46:01  
2014 UTC
@@ -5343,15 +5343,28 @@
 }


-static void TryCatchNestedHelper(int depth) {
+static void TryCatchNested1Helper(int depth) {
   if (depth > 0) {
     v8::TryCatch try_catch;
     try_catch.SetVerbose(true);
-    TryCatchNestedHelper(depth - 1);
+    TryCatchNested1Helper(depth - 1);
     CHECK(try_catch.HasCaught());
     try_catch.ReThrow();
   } else {
-    CcTest::isolate()->ThrowException(v8_str("back"));
+    CcTest::isolate()->ThrowException(v8_str("E1"));
+  }
+}
+
+
+static void TryCatchNested2Helper(int depth) {
+  if (depth > 0) {
+    v8::TryCatch try_catch;
+    try_catch.SetVerbose(true);
+    TryCatchNested2Helper(depth - 1);
+    CHECK(try_catch.HasCaught());
+    try_catch.ReThrow();
+  } else {
+    CompileRun("throw 'E2';");
   }
 }

@@ -5360,10 +5373,22 @@
   v8::V8::Initialize();
   LocalContext context;
   v8::HandleScope scope(context->GetIsolate());
-  v8::TryCatch try_catch;
-  TryCatchNestedHelper(5);
-  CHECK(try_catch.HasCaught());
-  CHECK_EQ(0,  
strcmp(*v8::String::Utf8Value(try_catch.Exception()), "back"));
+
+  {
+    // Test nested try-catch with a native throw in the end.
+    v8::TryCatch try_catch;
+    TryCatchNested1Helper(5);
+    CHECK(try_catch.HasCaught());
+    CHECK_EQ(0,  
strcmp(*v8::String::Utf8Value(try_catch.Exception()), "E1"));
+  }
+
+  {
+    // Test nested try-catch with a JavaScript throw in the end.
+    v8::TryCatch try_catch;
+    TryCatchNested2Helper(5);
+    CHECK(try_catch.HasCaught());
+    CHECK_EQ(0,  
strcmp(*v8::String::Utf8Value(try_catch.Exception()), "E2"));
+  }
 }


@@ -5407,6 +5432,28 @@
   CompileRunWithOrigin("TryCatchMixedNestingHelper();\n", "outer", 1, 1);
   TryCatchMixedNestingCheck(&try_catch);
 }
+
+
+void TryCatchNativeHelper(const v8::FunctionCallbackInfo<v8::Value>& args)  
{
+  ApiTestFuzzer::Fuzz();
+  v8::TryCatch try_catch;
+  args.GetIsolate()->ThrowException(v8_str("boom"));
+  CHECK(try_catch.HasCaught());
+}
+
+
+TEST(TryCatchNative) {
+  v8::Isolate* isolate = CcTest::isolate();
+  v8::HandleScope scope(isolate);
+  v8::V8::Initialize();
+  v8::TryCatch try_catch;
+  Local<ObjectTemplate> templ = ObjectTemplate::New(isolate);
+  templ->Set(v8_str("TryCatchNativeHelper"),
+             v8::FunctionTemplate::New(isolate, TryCatchNativeHelper));
+  LocalContext context(0, templ);
+  CompileRun("TryCatchNativeHelper();");
+  CHECK(!try_catch.HasCaught());
+}


 THREADED_TEST(Equality) {
@@ -12963,22 +13010,29 @@
   Local<Value> result = instance->GetRealNamedProperty(v8_str("f"));
   CHECK(try_catch.HasCaught());
   try_catch.Reset();
-  CHECK(result.IsEmpty());
+  // TODO(mstarzinger): The exception is propagated directly to the  
TryCatch
+  // scope and is never scheduled, because there is no real JavaScript  
frame
+  // between here and the ThrowingGetter. Fixing this will make the result  
a
+  // proper empty handle again.
+  CHECK(result->IsUndefined());

   result = another->GetRealNamedProperty(v8_str("f"));
   CHECK(try_catch.HasCaught());
   try_catch.Reset();
-  CHECK(result.IsEmpty());
+  // TODO(mstarzinger): Likewise.
+  CHECK(result->IsUndefined());

   result = another->GetRealNamedPropertyInPrototypeChain(v8_str("f"));
   CHECK(try_catch.HasCaught());
   try_catch.Reset();
-  CHECK(result.IsEmpty());
+  // TODO(mstarzinger): Likewise.
+  CHECK(result->IsUndefined());

   result = another->Get(v8_str("f"));
   CHECK(try_catch.HasCaught());
   try_catch.Reset();
-  CHECK(result.IsEmpty());
+  // TODO(mstarzinger): Likewise.
+  CHECK(result->IsUndefined());

   result = with_js_getter->GetRealNamedProperty(v8_str("f"));
   CHECK(try_catch.HasCaught());

--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
--- 
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.