- Ensure that HandleScope is initialized with a thread. (Remove

runtime/vm/service_isolate.cc

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/service_isolate.h"
 
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/isolate.h"
@@ skipping 201 matching lines @@
   Function& register_function_;
   Isolate* service_isolate_;
 };
 
 
 
 class ServiceIsolateNatives : public AllStatic {
  public:
   static void SendIsolateServiceMessage(Dart_NativeArguments args) {
     NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
-    Isolate* isolate = arguments->thread()->isolate();
-    StackZone stack_zone(isolate);
+    Thread* thread = arguments->thread();
+    StackZone stack_zone(thread);
     Zone* zone = stack_zone.GetZone();  // Used by GET_NON_NULL_NATIVE_ARGUMENT.
-    HANDLESCOPE(isolate);
+    HANDLESCOPE(thread);
     GET_NON_NULL_NATIVE_ARGUMENT(SendPort, sp, arguments->NativeArgAt(0));
     GET_NON_NULL_NATIVE_ARGUMENT(Array, message, arguments->NativeArgAt(1));
 
     // Set the type of the OOB message.
-    message.SetAt(0, Smi::Handle(isolate, Smi::New(Message::kServiceOOBMsg)));
+    message.SetAt(0, Smi::Handle(thread->zone(),
+                                 Smi::New(Message::kServiceOOBMsg)));
 
     // Serialize message.
     uint8_t* data = NULL;
     MessageWriter writer(&data, &allocator, false);
     writer.WriteMessage(message);
 
     // TODO(turnidge): Throw an exception when the return value is false?
     bool result = PortMap::PostMessage(
         new Message(sp.Id(), data, writer.BytesWritten(),
                     Message::kOOBPriority));
     arguments->SetReturn(Bool::Get(result));
   }
 
   static void SendRootServiceMessage(Dart_NativeArguments args) {
     NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
-    Isolate* isolate = arguments->thread()->isolate();
-    StackZone stack_zone(isolate);
+    Thread* thread = arguments->thread();
+    StackZone stack_zone(thread);
     Zone* zone = stack_zone.GetZone();  // Used by GET_NON_NULL_NATIVE_ARGUMENT.
-    HANDLESCOPE(isolate);
+    HANDLESCOPE(thread);
     GET_NON_NULL_NATIVE_ARGUMENT(Array, message, arguments->NativeArgAt(0));
     Service::HandleRootMessage(message);
   }
 
   static void OnStart(Dart_NativeArguments args) {
     NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
-    Isolate* isolate = arguments->thread()->isolate();
-    StackZone zone(isolate);
-    HANDLESCOPE(isolate);
+    Thread* thread = arguments->thread();
+    Isolate* isolate = thread->isolate();
+    StackZone zone(thread);
+    HANDLESCOPE(thread);
     {
       if (FLAG_trace_service) {
         OS::Print("vm-service: Booting dart:vmservice library.\n");
       }
       // Boot the dart:vmservice library.
       Dart_EnterScope();
       Dart_Handle url_str =
           Dart_NewStringFromCString(Symbols::Name(Symbols::kDartVMServiceId));
       Dart_Handle library = Dart_LookupLibrary(url_str);
       ASSERT(Dart_IsLibrary(library));
@@ skipping 11 matching lines @@
         OS::Print("vm-service: Registering running isolates.\n");
       }
       // Register running isolates with service.
       RegisterRunningIsolatesVisitor register_isolates(isolate);
       Isolate::VisitIsolates(&register_isolates);
     }
   }
 
   static void OnExit(Dart_NativeArguments args) {
     NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
-    Isolate* isolate = arguments->thread()->isolate();
-    StackZone zone(isolate);
-    HANDLESCOPE(isolate);
+    Thread* thread = arguments->thread();
+    StackZone zone(thread);
+    HANDLESCOPE(thread);
     {
       if (FLAG_trace_service) {
         OS::Print("vm-service: processed exit message.\n");
       }
     }
   }
 
   static void ListenStream(Dart_NativeArguments args) {
     NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
-    Isolate* isolate = arguments->thread()->isolate();
-    StackZone stack_zone(isolate);
+    Thread* thread = arguments->thread();
+    StackZone stack_zone(thread);
     Zone* zone = stack_zone.GetZone();  // Used by GET_NON_NULL_NATIVE_ARGUMENT.
-    HANDLESCOPE(isolate);
+    HANDLESCOPE(thread);
     GET_NON_NULL_NATIVE_ARGUMENT(String, stream_id, arguments->NativeArgAt(0));
     bool result = Service::ListenStream(stream_id.ToCString());
     arguments->SetReturn(Bool::Get(result));
   }
 
   static void CancelStream(Dart_NativeArguments args) {
     NativeArguments* arguments = reinterpret_cast<NativeArguments*>(args);
-    Isolate* isolate = arguments->thread()->isolate();
-    StackZone stack_zone(isolate);
+    Thread* thread = arguments->thread();
+    StackZone stack_zone(thread);
     Zone* zone = stack_zone.GetZone();  // Used by GET_NON_NULL_NATIVE_ARGUMENT.
-    HANDLESCOPE(isolate);
+    HANDLESCOPE(thread);
     GET_NON_NULL_NATIVE_ARGUMENT(String, stream_id, arguments->NativeArgAt(0));
     Service::CancelStream(stream_id.ToCString());
   }
 };
 
 
 struct ServiceNativeEntry {
   const char* name;
   int num_arguments;
   Dart_NativeFunction function;
@@ skipping 90 matching lines @@
 Dart_Port ServiceIsolate::LoadPort() {
   MonitorLocker ml(monitor_);
   return load_port_;
 }
 
 
 bool ServiceIsolate::SendIsolateStartupMessage() {
   if (!IsRunning()) {
     return false;
   }
-  Isolate* isolate = Isolate::Current();
+  Thread* thread = Thread::Current();
+  Isolate* isolate = thread->isolate();
   if (IsServiceIsolateDescendant(isolate)) {
     return false;
   }
   ASSERT(isolate != NULL);
-  HANDLESCOPE(isolate);
+  HANDLESCOPE(thread);
   const String& name = String::Handle(String::New(isolate->name()));
   ASSERT(!name.IsNull());
   const Array& list = Array::Handle(
       MakeServiceControlMessage(Dart_GetMainPortId(),
                                 VM_SERVICE_ISOLATE_STARTUP_MESSAGE_ID,
                                 name));
   ASSERT(!list.IsNull());
   uint8_t* data = NULL;
   MessageWriter writer(&data, &allocator, false);
   writer.WriteMessage(list);
   intptr_t len = writer.BytesWritten();
   if (FLAG_trace_service) {
     OS::Print("vm-service: Isolate %s %" Pd64 " registered.\n",
               name.ToCString(),
               Dart_GetMainPortId());
   }
   return PortMap::PostMessage(
       new Message(port_, data, len, Message::kNormalPriority));
 }
 
 
 bool ServiceIsolate::SendIsolateShutdownMessage() {
   if (!IsRunning()) {
     return false;
   }
-  Isolate* isolate = Isolate::Current();
+  Thread* thread = Thread::Current();
+  Isolate* isolate = thread->isolate();
   if (IsServiceIsolateDescendant(isolate)) {
     return false;
   }
   ASSERT(isolate != NULL);
-  HANDLESCOPE(isolate);
+  HANDLESCOPE(thread);
   const String& name = String::Handle(String::New(isolate->name()));
   ASSERT(!name.IsNull());
   const Array& list = Array::Handle(
       MakeServiceControlMessage(Dart_GetMainPortId(),
                                 VM_SERVICE_ISOLATE_SHUTDOWN_MESSAGE_ID,
                                 name));
   ASSERT(!list.IsNull());
   uint8_t* data = NULL;
   MessageWriter writer(&data, &allocator, false);
   writer.WriteMessage(list);
@@ skipping 42 matching lines @@
   }
 }
 
 void ServiceIsolate::SetLoadPort(Dart_Port port) {
   MonitorLocker ml(monitor_);
   load_port_ = port;
 }
 
 
 void ServiceIsolate::MaybeInjectVMServiceLibrary(Isolate* isolate) {
+  Thread* thread = Thread::Current();
+  ASSERT(isolate == thread->isolate());
   ASSERT(isolate != NULL);
   ASSERT(isolate->name() != NULL);
   if (!ServiceIsolate::NameEquals(isolate->name())) {
     // Not service isolate.
     return;
   }
   if (Exists()) {
     // Service isolate already exists.
     return;
   }
   SetServiceIsolate(isolate);
 
   StackZone zone(isolate);
-  HANDLESCOPE(isolate);
+  HANDLESCOPE(thread);
 
   // Register dart:vmservice library.
   const String& url_str = String::Handle(Symbols::DartVMService().raw());
   const Library& library = Library::Handle(Library::New(url_str));
   library.Register();
   library.set_native_entry_resolver(ServiceNativeResolver);
 
   // Temporarily install our library tag handler.
   isolate->set_library_tag_handler(LibraryTagHandler);
 
@@ skipping 25 matching lines @@
 
   // Uninstall our library tag handler.
   isolate->set_library_tag_handler(NULL);
 }
 
 
 void ServiceIsolate::ConstructExitMessageAndCache(Isolate* isolate) {
   // Construct and cache exit message here so we can send it without needing an
   // isolate.
   StartIsolateScope iso_scope(isolate);
+  Thread* thread = Thread::Current();
+  ASSERT(isolate == thread->isolate());
+  ASSERT(isolate != NULL);
   StackZone zone(isolate);
-  HANDLESCOPE(isolate);
+  HANDLESCOPE(thread);
   ASSERT(exit_message_ == NULL);
   ASSERT(exit_message_length_ == 0);
   const Array& list = Array::Handle(MakeServiceExitMessage());
   ASSERT(!list.IsNull());
   MessageWriter writer(&exit_message_, &allocator, false);
   writer.WriteMessage(list);
   exit_message_length_ = writer.BytesWritten();
   ASSERT(exit_message_ != NULL);
   ASSERT(exit_message_length_ != 0);
 }
@@ skipping 64 matching lines @@
   }
 
  protected:
   static void ShutdownIsolate(uword parameter) {
     Isolate* isolate = reinterpret_cast<Isolate*>(parameter);
     ASSERT(ServiceIsolate::IsServiceIsolate(isolate));
     {
       // Print the error if there is one.  This may execute dart code to
       // print the exception object, so we need to use a StartIsolateScope.
       StartIsolateScope start_scope(isolate);
+      Thread* thread = Thread::Current();
+      ASSERT(isolate == thread->isolate());
       StackZone zone(isolate);
-      HandleScope handle_scope(isolate);
+      HandleScope handle_scope(thread);
       Error& error = Error::Handle();
       error = isolate->object_store()->sticky_error();
       if (!error.IsNull()) {
         OS::PrintErr("vm-service: Error: %s\n", error.ToErrorCString());
       }
       Dart::RunShutdownCallback();
     }
     {
       // Shut the isolate down.
       SwitchIsolateScope switch_scope(isolate);
       Dart::ShutdownIsolate();
     }
     ServiceIsolate::SetServiceIsolate(NULL);
     ServiceIsolate::SetServicePort(ILLEGAL_PORT);
     if (FLAG_trace_service) {
       OS::Print("vm-service: Shutdown.\n");
     }
     ServiceIsolate::FinishedExiting();
   }
 
   void RunMain(Isolate* isolate) {
     StartIsolateScope iso_scope(isolate);
+    Thread* thread = Thread::Current();
+    ASSERT(isolate == thread->isolate());
     StackZone zone(isolate);
-    HANDLESCOPE(isolate);
+    HANDLESCOPE(thread);
     // Invoke main which will return the loadScriptPort.
     const Library& root_library =
         Library::Handle(isolate, isolate->object_store()->root_library());
     if (root_library.IsNull()) {
       if (FLAG_trace_service) {
         OS::Print("vm-service: Embedder did not install a script.");
       }
       // Service isolate is not supported by embedder.
       return;
     }
@@ skipping 101 matching lines @@
     return result;
   }
   Dart_Handle source = GetSource(url_string);
   if (Dart_IsError(source)) {
     return source;
   }
   return Dart_LoadSource(library, url, source, 0, 0);
 }
 
 }  // namespace dart