Bring toiger up to date with bleeding edge 984.

src/debug.cc

 // Copyright 2006-2008 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 831 matching lines @@
   // Flood the function with break points.
   BreakLocationIterator it(GetDebugInfo(shared), ALL_BREAK_LOCATIONS);
   while (!it.Done()) {
     it.SetOneShot();
     it.Next();
   }
 }
 
 
 void Debug::FloodHandlerWithOneShot() {
+  // Iterate through the JavaScript stack looking for handlers.
   StackFrame::Id id = Top::break_frame_id();
+  if (id == StackFrame::NO_ID) {
+    // If there is no JavaScript stack don't do anything.
+    return;
+  }
   for (JavaScriptFrameIterator it(id); !it.done(); it.Advance()) {
     JavaScriptFrame* frame = it.frame();
     if (frame->HasHandler()) {
       Handle<SharedFunctionInfo> shared =
           Handle<SharedFunctionInfo>(
               JSFunction::cast(frame->function())->shared());
       // Flood the function with the catch block with break points
       FloodWithOneShot(shared);
       return;
     }
@@ skipping 16 matching lines @@
 
   // Remember this step action and count.
   thread_local_.last_step_action_ = step_action;
   thread_local_.step_count_ = step_count;
 
   // Get the frame where the execution has stopped and skip the debug frame if
   // any. The debug frame will only be present if execution was stopped due to
   // hitting a break point. In other situations (e.g. unhandled exception) the
   // debug frame is not present.
   StackFrame::Id id = Top::break_frame_id();
+  if (id == StackFrame::NO_ID) {
+    // If there is no JavaScript stack don't do anything.
+    return;
+  }
   JavaScriptFrameIterator frames_it(id);
   JavaScriptFrame* frame = frames_it.frame();
 
   // First of all ensure there is one-shot break points in the top handler
   // if any.
   FloodHandlerWithOneShot();
 
   // If the function on the top frame is unresolved perform step out. This will
   // be the case when calling unknown functions and having the debugger stopped
   // in an unhandled exception.
@@ skipping 794 matching lines @@
 // Called by the V8 thread.
 // The new copy of the event string is destroyed in Run().
 void DebugMessageThread::SendMessage(Vector<uint16_t> message) {
   Vector<uint16_t> message_copy = message.Clone();
   Logger::DebugTag("Put message on event message_queue.");
   message_queue_.Put(message_copy);
   message_received_->Signal();
 }
 
 
-void DebugMessageThread::SetEventJSONFromEvent(Handle<Object> event_data) {
+bool DebugMessageThread::SetEventJSONFromEvent(Handle<Object> event_data) {
   v8::HandleScope scope;
   // Call toJSONProtocol on the debug event object.
   v8::Local<v8::Object> api_event_data =
       v8::Utils::ToLocal(Handle<JSObject>::cast(event_data));
   v8::Local<v8::String> fun_name = v8::String::New("toJSONProtocol");
   v8::Local<v8::Function> fun =
       v8::Function::Cast(*api_event_data->Get(fun_name));
   v8::TryCatch try_catch;
   v8::Local<v8::Value> json_event = *fun->Call(api_event_data, 0, NULL);
   v8::Local<v8::String> json_event_string;
   if (!try_catch.HasCaught()) {
     if (!json_event->IsUndefined()) {
       json_event_string = json_event->ToString();
       if (FLAG_trace_debug_json) {
         PrintLn(json_event_string);
       }
       v8::String::Value val(json_event_string);
       Vector<uint16_t> str(reinterpret_cast<uint16_t*>(*val),
                            json_event_string->Length());
       SendMessage(str);
     } else {
       SendMessage(Vector<uint16_t>::empty());
     }
   } else {
     PrintLn(try_catch.Exception());
-    SendMessage(Vector<uint16_t>::empty());
+    return false;
   }
+  return true;
 }
 
 
 void DebugMessageThread::Run() {
   // Sends debug events to an installed debugger message callback.
   while (true) {
     // Wait and Get are paired so that semaphore count equals queue length.
     message_received_->Wait();
     Logger::DebugTag("Get message from event message_queue.");
     Vector<uint16_t> message = message_queue_.Get();
@@ skipping 42 matching lines @@
       v8::Function::Cast(*api_exec_state->Get(fun_name));
   v8::TryCatch try_catch;
   v8::Local<v8::Object> cmd_processor =
       v8::Object::Cast(*fun->Call(api_exec_state, 0, NULL));
   if (try_catch.HasCaught()) {
     PrintLn(try_catch.Exception());
     return;
   }
 
   // Notify the debugger that a debug event has occurred.
-  host_running_ = false;
-  SetEventJSONFromEvent(event_data);
+  bool success = SetEventJSONFromEvent(event_data);
+  if (!success) {
+    // If failed to notify debugger just continue running.
+    return;
+  }
 
   // Wait for requests from the debugger.
+  host_running_ = false;
   while (true) {
     command_received_->Wait();
     Logger::DebugTag("Got request from command queue, in interactive loop.");
     Vector<uint16_t> command = command_queue_.Get();
     ASSERT(!host_running_);
     if (!Debugger::debugger_active()) {
       host_running_ = true;
       return;
     }
 
@@ skipping 153 matching lines @@
 }
 
 
 void LockingMessageQueue::Clear() {
   ScopedLock sl(lock_);
   queue_.Clear();
 }
 
 
 } }  // namespace v8::internal