Reland "Load service isolate from a .dill file."

runtime/bin/dfe.cc

 // Copyright (c) 2017, 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 "bin/dfe.h"
 #include "bin/dartutils.h"
 #include "bin/error_exit.h"
 #include "bin/file.h"
 
 #include "vm/kernel.h"
 
 namespace dart {
 namespace bin {
 
 const char kPlatformBinaryName[] = "platform.dill";
+const char kVMServiceIOBinaryName[] = "vmservice_io.dill";
 
 
 DFE::DFE()
     : frontend_filename_(NULL),
       platform_binary_filename_(NULL),
-      kernel_platform_(NULL) {}
+      vmservice_io_binary_filename_(NULL),
+      kernel_platform_(NULL),
+      kernel_vmservice_io_(NULL) {}
 
 
 DFE::~DFE() {
   frontend_filename_ = NULL;
 
   if (platform_binary_filename_ != NULL) {
     delete platform_binary_filename_;
     platform_binary_filename_ = NULL;
   }
 
   if (kernel_platform_ != NULL) {
     delete reinterpret_cast<kernel::Program*>(kernel_platform_);
     kernel_platform_ = NULL;
   }
+
+  if (kernel_vmservice_io_ != NULL) {
+    delete reinterpret_cast<kernel::Program*>(kernel_vmservice_io_);
+    kernel_vmservice_io_ = NULL;
+  }
 }
 
 
 void DFE::SetKernelBinaries(const char* name) {
   intptr_t len = snprintf(NULL, 0, "%s%s%s", name, File::PathSeparator(),
                           kPlatformBinaryName) +
                  1;
   platform_binary_filename_ = new char[len];
   snprintf(platform_binary_filename_, len, "%s%s%s", name,
            File::PathSeparator(), kPlatformBinaryName);
+
+  len = snprintf(NULL, 0, "%s%s%s", name, File::PathSeparator(),
+                 kVMServiceIOBinaryName) +
+        1;
+  vmservice_io_binary_filename_ = new char[len];
+  snprintf(vmservice_io_binary_filename_, len, "%s%s%s", name,
+           File::PathSeparator(), kVMServiceIOBinaryName);
 }
 
 
 Dart_Handle DFE::ReloadScript(Dart_Isolate isolate, const char* url_string) {
   ASSERT(!Dart_IsServiceIsolate(isolate) && !Dart_IsKernelIsolate(isolate));
   // First check if the URL points to a Kernel IR file in which case we
   // skip the compilation step and directly reload the file.
   const uint8_t* kernel_ir = NULL;
   intptr_t kernel_ir_size = -1;
   if (!TryReadKernelFile(url_string, &kernel_ir, &kernel_ir_size)) {
@@ skipping 46 matching lines @@
   }
   return NULL;
 }
 
 
 void* DFE::ReadPlatform() {
   return kernel_platform_ = ReadScript(platform_binary_filename_);
 }
 
 
+void* DFE::ReadVMServiceIO() {
+  return kernel_vmservice_io_ = ReadScript(vmservice_io_binary_filename_);
+}
+
+
 void* DFE::ReadScript(const char* script_uri) {
   const uint8_t* buffer = NULL;
   intptr_t buffer_length = -1;
   bool result = TryReadKernelFile(script_uri, &buffer, &buffer_length);
   if (result) {
     return Dart_ReadKernelBinary(buffer, buffer_length);
   }
   return NULL;
 }
 
@@ skipping 27 matching lines @@
         return true;
       }
     }
   }
   return false;
 }
 
 
 }  // namespace bin
 }  // namespace dart