Fix TryCatch.ReThrow() to not clobber Message.

src/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 2034 matching lines @@
 }
 
 
 // --- E x c e p t i o n s ---
 
 
 v8::TryCatch::TryCatch()
     : isolate_(i::Isolate::Current()),
       next_(isolate_->try_catch_handler_address()),
       exception_(isolate_->heap()->the_hole_value()),
-      message_(i::Smi::FromInt(0)),
+      message_obj_(i::Smi::FromInt(0)),
+      message_script_(i::Smi::FromInt(0)),
+      message_start_pos_(0),
+      message_end_pos_(0),
       is_verbose_(false),
       can_continue_(true),
       capture_message_(true),
       rethrow_(false),
       has_terminated_(false) {
   isolate_->RegisterTryCatchHandler(this);
 }
 
 
 v8::TryCatch::~TryCatch() {
   ASSERT(isolate_ == i::Isolate::Current());
   if (rethrow_) {
     v8::HandleScope scope(reinterpret_cast<Isolate*>(isolate_));
     v8::Local<v8::Value> exc = v8::Local<v8::Value>::New(Exception());
     isolate_->UnregisterTryCatchHandler(this);
+    if (HasCaught() && capture_message_) {
+      // If an exception was caught and rethrow_ is indicated, the saved
+      // message, script, and location need to be restored to Isolate TLS
+      // so that DoThrow() does not overwrite the values from the original
+      // exception with new ones computed at the current location.
+      i::Object* message = reinterpret_cast<i::Object*>(message_obj_);
+      i::Script* script = message_script_ ?
+        reinterpret_cast<i::Script*>(message_script_) : NULL;
+      isolate_->RestoreMessage(message, script,
+                               message_start_pos_, message_end_pos_);
+    }
     v8::ThrowException(exc);
   } else {
     isolate_->UnregisterTryCatchHandler(this);
   }
 }
 
 
 bool v8::TryCatch::HasCaught() const {
   return !reinterpret_cast<i::Object*>(exception_)->IsTheHole();
 }
@@ skipping 41 matching lines @@
     if (value.is_null()) return v8::Local<Value>();
     return v8::Utils::ToLocal(scope.CloseAndEscape(value));
   } else {
     return v8::Local<Value>();
   }
 }
 
 
 v8::Local<v8::Message> v8::TryCatch::Message() const {
   ASSERT(isolate_ == i::Isolate::Current());
-  if (HasCaught() && message_ != i::Smi::FromInt(0)) {
-    i::Object* message = reinterpret_cast<i::Object*>(message_);
+  if (HasCaught() && message_obj_ != i::Smi::FromInt(0)) {
+    i::Object* message = reinterpret_cast<i::Object*>(message_obj_);
     return v8::Utils::MessageToLocal(i::Handle<i::Object>(message, isolate_));
   } else {
     return v8::Local<v8::Message>();
   }
 }
 
 
 void v8::TryCatch::Reset() {
   ASSERT(isolate_ == i::Isolate::Current());
   exception_ = isolate_->heap()->the_hole_value();
-  message_ = i::Smi::FromInt(0);
+  message_obj_ = i::Smi::FromInt(0);
+  message_script_ = i::Smi::FromInt(0);
+  message_start_pos_ = 0;
+  message_end_pos_ = 0;
 }
 
 
 void v8::TryCatch::SetVerbose(bool value) {
   is_verbose_ = value;
 }
 
 
 void v8::TryCatch::SetCaptureMessage(bool value) {
   capture_message_ = value;
@@ skipping 5702 matching lines @@
 
   v->VisitPointers(blocks_.first(), first_block_limit_);
 
   for (int i = 1; i < blocks_.length(); i++) {
     v->VisitPointers(blocks_[i], &blocks_[i][kHandleBlockSize]);
   }
 }
 
 
 } }  // namespace v8::internal