Remove isolate argument from handle allocation: Part I

runtime/lib/vmservice.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/bootstrap_natives.h"
 
 #include "vm/dart_api_impl.h"
 #include "vm/exceptions.h"
 #include "vm/message.h"
 #include "vm/native_entry.h"
 #include "vm/object.h"
 #include "vm/port.h"
 #include "vm/service_isolate.h"
 #include "vm/symbols.h"
 
 namespace dart {
 
 DECLARE_FLAG(bool, trace_service);
 
 static uint8_t* allocator(uint8_t* ptr, intptr_t old_size, intptr_t new_size) {
   void* new_ptr = realloc(reinterpret_cast<void*>(ptr), new_size);
   return reinterpret_cast<uint8_t*>(new_ptr);
 }
 
 
 class RegisterRunningIsolatesVisitor : public IsolateVisitor {
  public:
-  explicit RegisterRunningIsolatesVisitor(Isolate* service_isolate)
+  explicit RegisterRunningIsolatesVisitor(Thread* thread)
       : IsolateVisitor(),
-        register_function_(Function::Handle(service_isolate)),
-        service_isolate_(service_isolate) {
+        register_function_(Function::Handle(thread->zone())),
+        service_isolate_(thread->isolate()) {
     ASSERT(ServiceIsolate::IsServiceIsolate(Isolate::Current()));
     // Get library.
     const String& library_url = Symbols::DartVMService();
     ASSERT(!library_url.IsNull());
     const Library& library =
         Library::Handle(Library::LookupLibrary(library_url));
     ASSERT(!library.IsNull());
     // Get function.
     const String& function_name =
         String::Handle(String::New("_registerIsolate"));
@@ skipping 14 matching lines @@
     const Integer& port_int = Integer::Handle(Integer::New(port_id));
     ASSERT(!port_int.IsNull());
     const SendPort& send_port = SendPort::Handle(SendPort::New(port_id));
     const String& name = String::Handle(String::New(isolate->name()));
     ASSERT(!name.IsNull());
     const Array& args = Array::Handle(Array::New(3));
     ASSERT(!args.IsNull());
     args.SetAt(0, port_int);
     args.SetAt(1, send_port);
     args.SetAt(2, name);
-    Object& r = Object::Handle(service_isolate_);
+    Object& r = Object::Handle(service_isolate_->current_zone());
     r = DartEntry::InvokeFunction(register_function_, args);
     if (FLAG_trace_service) {
       OS::Print("vm-service: Isolate %s %" Pd64 " registered.\n",
                 name.ToCString(),
                 port_id);
     }
     ASSERT(!r.IsError());
   }
 
  private:
@@ skipping 31 matching lines @@
 
 
 DEFINE_NATIVE_ENTRY(VMService_OnStart, 0) {
   if (FLAG_trace_service) {
     OS::Print("vm-service: Booting dart:vmservice library.\n");
   }
   // Boot the dart:vmservice library.
   ServiceIsolate::BootVmServiceLibrary();
 
   // Register running isolates with service.
-  RegisterRunningIsolatesVisitor register_isolates(isolate);
+  RegisterRunningIsolatesVisitor register_isolates(thread);
   if (FLAG_trace_service) {
     OS::Print("vm-service: Registering running isolates.\n");
   }
   Isolate::VisitIsolates(&register_isolates);
 
   return Object::null();
 }
 
 
 DEFINE_NATIVE_ENTRY(VMService_OnExit, 0) {
@@ skipping 11 matching lines @@
 }
 
 
 DEFINE_NATIVE_ENTRY(VMService_CancelStream, 1) {
   GET_NON_NULL_NATIVE_ARGUMENT(String, stream_id, arguments->NativeArgAt(0));
   Service::CancelStream(stream_id.ToCString());
   return Object::null();
 }
 
 }  // namespace dart