Fix TryCatch.ReThrow() to not clobber Message.

test/cctest/test-api.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 4304 matching lines @@
   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"));
 }
 
 
+v8::Handle<Value> TryCatchNestedSyntaxHelper(const v8::Arguments& args) {
+  ApiTestFuzzer::Fuzz();
+  v8::TryCatch try_catch;
+  v8::ScriptOrigin origin(v8::String::New("inner"),
+                          v8::Integer::New(1), v8::Integer::New(1));
+  v8::Script::Compile(v8::String::New("invalid ?= 1;\n"), &origin);
+  CHECK(try_catch.HasCaught());
+  return try_catch.ReThrow();
+}
+
+
+// This test ensures that an outer TryCatch in the following situation:
+//   C++/TryCatch -> JS -> C++/TryCatch -> JS w/ SyntaxError
+// does clobber the Message object generated for the inner TryCatch.
+// This exercises the ability of TryCatch.ReThrow() to restore the
+// inner pending Message before throwing the exception again.
+TEST(TryCatchNestedSyntax) {
+  v8::HandleScope scope(v8::Isolate::GetCurrent());
+  v8::V8::Initialize();
+  v8::TryCatch try_catch;
+  Local<ObjectTemplate> templ = ObjectTemplate::New();
+  templ->Set(v8_str("TryCatchNestedSyntaxHelper"),
+             v8::FunctionTemplate::New(TryCatchNestedSyntaxHelper));
+  LocalContext context(0, templ);
+  CompileRunWithOrigin("TryCatchNestedSyntaxHelper();\n", "outer", 1, 1);
+  CHECK(try_catch.HasCaught());
+  Handle<Value> resource = try_catch.Message()->GetScriptResourceName();
+  CHECK_EQ(0, strcmp(*v8::String::Utf8Value(resource), "inner"));
+}
+
+
 THREADED_TEST(Equality) {
   LocalContext context;
   v8::Isolate* isolate = context->GetIsolate();
   v8::HandleScope scope(context->GetIsolate());
   // Check that equality works at all before relying on CHECK_EQ
   CHECK(v8_str("a")->Equals(v8_str("a")));
   CHECK(!v8_str("a")->Equals(v8_str("b")));
 
   CHECK_EQ(v8_str("a"), v8_str("a"));
   CHECK_NE(v8_str("a"), v8_str("b"));
@@ skipping 14748 matching lines @@
   i::Semaphore* sem_;
   volatile int sem_value_;
 };
 
 
 THREADED_TEST(SemaphoreInterruption) {
   ThreadInterruptTest().RunTest();
 }
 
 #endif  // WIN32