Replace the --platform vm option with --kernel-binaries option.

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";
+
+
 DFE::DFE()
     : frontend_filename_(NULL),
       platform_binary_filename_(NULL),
       kernel_platform_(NULL) {}
 
 
 DFE::~DFE() {
   frontend_filename_ = NULL;
-  platform_binary_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;
   }
-  kernel_platform_ = 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);
+}
+
+
 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)) {
     // We have a source file, compile it into a kernel ir first.
     // TODO(asiva): We will have to change this API to pass in a list of files
     // that have changed. For now just pass in the main url_string and have it
@@ skipping 39 matching lines @@
     case Dart_KernelCompilationStatus_Unknown:
       *error = result.error;  // Copy error message.
       *exit_code = kErrorExitCode;
       break;
   }
   return NULL;
 }
 
 
 void* DFE::ReadPlatform() {
-  const uint8_t* buffer = NULL;
-  intptr_t buffer_length = -1;
-  bool result =
-      TryReadKernelFile(platform_binary_filename_, &buffer, &buffer_length);
-  if (result) {
-    kernel_platform_ = Dart_ReadKernelBinary(buffer, buffer_length);
-    return kernel_platform_;
-  }
-  return NULL;
+  return kernel_platform_ = ReadScript(platform_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);
   }
@@ skipping 30 matching lines @@
         return true;
       }
     }
   }
   return false;
 }
 
 
 }  // namespace bin
 }  // namespace dart