Added a version of the v8::HandleScope constructor with an Isolate and use that consistently.

src/d8-debug.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 36 matching lines @@
 
 void PrintPrompt() {
   PrintPrompt(was_running);
 }
 
 
 void HandleDebugEvent(DebugEvent event,
                       Handle<Object> exec_state,
                       Handle<Object> event_data,
                       Handle<Value> data) {
-  HandleScope scope;
+  // TODO(svenpanne) There should be a way to retrieve this in the callback.
+  Isolate* isolate = Isolate::GetCurrent();
+  HandleScope scope(isolate);
 
   // Check for handled event.
   if (event != Break && event != Exception && event != AfterCompile) {
     return;
   }
 
   TryCatch try_catch;
 
   // Get the toJSONProtocol function on the event and get the JSON format.
   Local<String> to_json_fun_name = String::New("toJSONProtocol");
   Local<Function> to_json_fun =
       Function::Cast(*event_data->Get(to_json_fun_name));
   Local<Value> event_json = to_json_fun->Call(event_data, 0, NULL);
   if (try_catch.HasCaught()) {
-    Shell::ReportException(&try_catch);
+    Shell::ReportException(isolate, &try_catch);
     return;
   }
 
   // Print the event details.
   Handle<Object> details =
       Shell::DebugMessageDetails(Handle<String>::Cast(event_json));
   if (try_catch.HasCaught()) {
-    Shell::ReportException(&try_catch);
+    Shell::ReportException(isolate, &try_catch);
     return;
   }
   String::Utf8Value str(details->Get(String::New("text")));
   if (str.length() == 0) {
     // Empty string is used to signal not to process this event.
     return;
   }
   printf("%s\n", *str);
 
   // Get the debug command processor.
   Local<String> fun_name = String::New("debugCommandProcessor");
   Local<Function> fun = Function::Cast(*exec_state->Get(fun_name));
   Local<Object> cmd_processor =
       Object::Cast(*fun->Call(exec_state, 0, NULL));
   if (try_catch.HasCaught()) {
-    Shell::ReportException(&try_catch);
+    Shell::ReportException(isolate, &try_catch);
     return;
   }
 
   static const int kBufferSize = 256;
   bool running = false;
   while (!running) {
     char command[kBufferSize];
     PrintPrompt(running);
     char* str = fgets(command, kBufferSize, stdin);
     if (str == NULL) break;
 
     // Ignore empty commands.
     if (strlen(command) == 0) continue;
 
     TryCatch try_catch;
 
     // Convert the debugger command to a JSON debugger request.
     Handle<Value> request =
         Shell::DebugCommandToJSONRequest(String::New(command));
     if (try_catch.HasCaught()) {
-      Shell::ReportException(&try_catch);
+      Shell::ReportException(isolate, &try_catch);
       continue;
     }
 
     // If undefined is returned the command was handled internally and there is
     // no JSON to send.
     if (request->IsUndefined()) {
       continue;
     }
 
     Handle<String> fun_name;
     Handle<Function> fun;
     // All the functions used below take one argument.
     static const int kArgc = 1;
     Handle<Value> args[kArgc];
 
     // Invoke the JavaScript to convert the debug command line to a JSON
     // request, invoke the JSON request and convert the JSON respose to a text
     // representation.
     fun_name = String::New("processDebugRequest");
     fun = Handle<Function>::Cast(cmd_processor->Get(fun_name));
     args[0] = request;
     Handle<Value> response_val = fun->Call(cmd_processor, kArgc, args);
     if (try_catch.HasCaught()) {
-      Shell::ReportException(&try_catch);
+      Shell::ReportException(isolate, &try_catch);
       continue;
     }
     Handle<String> response = Handle<String>::Cast(response_val);
 
     // Convert the debugger response into text details and the running state.
     Handle<Object> response_details = Shell::DebugMessageDetails(response);
     if (try_catch.HasCaught()) {
-      Shell::ReportException(&try_catch);
+      Shell::ReportException(isolate, &try_catch);
       continue;
     }
     String::Utf8Value text_str(response_details->Get(String::New("text")));
     if (text_str.length() > 0) {
       printf("%s\n", *text_str);
     }
     running =
         response_details->Get(String::New("running"))->ToBoolean()->Value();
   }
 }
 
 
-void RunRemoteDebugger(int port) {
-  RemoteDebugger debugger(port);
+void RunRemoteDebugger(Isolate* isolate, int port) {
+  RemoteDebugger debugger(isolate, port);
   debugger.Run();
 }
 
 
 void RemoteDebugger::Run() {
   bool ok;
 
   // Make sure that socket support is initialized.
   ok = i::Socket::SetUp();
   if (!ok) {
@@ skipping 92 matching lines @@
   head_ = head_->next();
   if (head_ == NULL) {
     ASSERT(tail_ == result);
     tail_ = NULL;
   }
   return result;
 }
 
 
 void RemoteDebugger::HandleMessageReceived(char* message) {
-  Locker lock(v8::Isolate::GetCurrent());
-  HandleScope scope;
+  Locker lock(isolate_);
+  HandleScope scope(isolate_);
 
   // Print the event details.
   TryCatch try_catch;
   Handle<Object> details =
       Shell::DebugMessageDetails(Handle<String>::Cast(String::New(message)));
   if (try_catch.HasCaught()) {
-    Shell::ReportException(&try_catch);
+    Shell::ReportException(isolate_, &try_catch);
     PrintPrompt();
     return;
   }
   String::Utf8Value str(details->Get(String::New("text")));
   if (str.length() == 0) {
     // Empty string is used to signal not to process this event.
     return;
   }
   if (*str != NULL) {
     printf("%s\n", *str);
   } else {
     printf("???\n");
   }
 
   bool is_running = details->Get(String::New("running"))->ToBoolean()->Value();
   PrintPrompt(is_running);
 }
 
 
 void RemoteDebugger::HandleKeyboardCommand(char* command) {
-  Locker lock(v8::Isolate::GetCurrent());
-  HandleScope scope;
+  Locker lock(isolate_);
+  HandleScope scope(isolate_);
 
   // Convert the debugger command to a JSON debugger request.
   TryCatch try_catch;
   Handle<Value> request =
       Shell::DebugCommandToJSONRequest(String::New(command));
   if (try_catch.HasCaught()) {
-    Shell::ReportException(&try_catch);
+    Shell::ReportException(isolate_, &try_catch);
     PrintPrompt();
     return;
   }
 
   // If undefined is returned the command was handled internally and there is
   // no JSON to send.
   if (request->IsUndefined()) {
     PrintPrompt();
     return;
   }
@@ skipping 37 matching lines @@
     // Pass the keyboard command to the main thread.
     remote_debugger_->KeyboardCommand(
         i::SmartArrayPointer<char>(i::StrDup(command)));
   }
 }
 
 
 }  // namespace v8
 
 #endif  // ENABLE_DEBUGGER_SUPPORT