Revert "Use Kernel frontend from run_vm_tests."

runtime/vm/kernel_isolate.cc

 // Copyright (c) 2016, 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/kernel_isolate.h"
 
-#include "bin/dartutils.h"
+#include "vm/compiler.h"
 #include "include/dart_native_api.h"
-#include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/isolate.h"
 #include "vm/lockers.h"
 #include "vm/message.h"
 #include "vm/message_handler.h"
+#include "vm/native_entry.h"
 #include "vm/native_arguments.h"
-#include "vm/native_entry.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/port.h"
 #include "vm/service.h"
 #include "vm/symbols.h"
 #include "vm/thread_pool.h"
 #include "vm/timeline.h"
 
 namespace dart {
 
@@ skipping 266 matching lines @@
     result_.kernel = NULL;
     result_.kernel_size = 0;
   }
 
   ~KernelCompilationRequest() {
     UnregisterRequest(this);
     Dart_CloseNativePort(port_);
     delete monitor_;
   }
 
-  Dart_KernelCompilationResult SendAndWaitForResponse(
-      Dart_Port kernel_port,
-      const char* script_uri,
-      int source_files_count,
-      Dart_SourceFile source_files[]) {
+  Dart_KernelCompilationResult SendAndWaitForResponse(Dart_Port kernel_port,
+                                                      const char* script_uri) {
     // Build the [null, send_port, script_uri] message for the Kernel isolate:
     // null tag tells it that request came from this code, instead of Loader
     // so that it can given a more informative response.
     Dart_CObject tag;
     tag.type = Dart_CObject_kNull;
 
     Dart_CObject send_port;
     send_port.type = Dart_CObject_kSendPort;
     send_port.value.as_send_port.id = port_;
     send_port.value.as_send_port.origin_id = ILLEGAL_PORT;
 
     Dart_CObject uri;
     uri.type = Dart_CObject_kString;
     uri.value.as_string = const_cast<char*>(script_uri);
 
+    static const intptr_t kMessageLen = 3;
+    Dart_CObject* message_arr[kMessageLen] = {&tag, &send_port, &uri};
+
     Dart_CObject message;
     message.type = Dart_CObject_kArray;
+    message.value.as_array.length = kMessageLen;
+    message.value.as_array.values = message_arr;
 
-    if (source_files_count == 0) {
-      static const intptr_t message_len = 3;
-      Dart_CObject* message_arr[] = {&tag, &send_port, &uri};
-      message.value.as_array.values = message_arr;
-      message.value.as_array.length = message_len;
-      // Send the message.
-      Dart_PostCObject(kernel_port, &message);
-    } else {
-      Dart_CObject files;
-      files.type = Dart_CObject_kArray;
-      files.value.as_array.length = source_files_count * 2;
-      // typedef Dart_CObject* Dart_CObjectPtr;
-      Dart_CObject** fileNamePairs = new Dart_CObject*[source_files_count * 2];
-      for (int i = 0; i < source_files_count; i++) {
-        Dart_CObject* source_uri = new Dart_CObject();
-        source_uri->type = Dart_CObject_kString;
-        source_uri->value.as_string = const_cast<char*>(source_files[i].uri);
-        fileNamePairs[i * 2] = source_uri;
-
-        Dart_CObject* source_code = new Dart_CObject();
-        source_code->type = Dart_CObject_kTypedData;
-        source_code->value.as_typed_data.type = Dart_TypedData_kUint8;
-        source_code->value.as_typed_data.length =
-            strlen(source_files[i].source);
-        source_code->value.as_typed_data.values = reinterpret_cast<uint8_t*>(
-            const_cast<char*>(source_files[i].source));
-        fileNamePairs[(i * 2) + 1] = source_code;
-      }
-      files.value.as_array.values = fileNamePairs;
-      static const intptr_t message_len = 4;
-      Dart_CObject* message_arr[] = {&tag, &send_port, &uri, &files};
-      message.value.as_array.values = message_arr;
-      message.value.as_array.length = message_len;
-      Dart_PostCObject(kernel_port, &message);
-    }
+    // Send the message.
+    Dart_PostCObject(kernel_port, &message);
 
     // Wait for reply to arrive.
     MonitorLocker ml(monitor_);
     while (result_.status == Dart_KernelCompilationStatus_Unknown) {
       ml.Wait();
     }
 
     return result_;
   }
 
@@ skipping 88 matching lines @@
   KernelCompilationRequest* next_;
   KernelCompilationRequest* prev_;
 
   Dart_KernelCompilationResult result_;
 };
 
 Monitor* KernelCompilationRequest::requests_monitor_ = new Monitor();
 KernelCompilationRequest* KernelCompilationRequest::requests_ = NULL;
 
 Dart_KernelCompilationResult KernelIsolate::CompileToKernel(
-    const char* script_uri,
-    int source_file_count,
-    Dart_SourceFile source_files[]) {
+    const char* script_uri) {
   // This must be the main script to be loaded. Wait for Kernel isolate
   // to finish initialization.
   Dart_Port kernel_port = WaitForKernelPort();
   if (kernel_port == ILLEGAL_PORT) {
     Dart_KernelCompilationResult result;
     result.status = Dart_KernelCompilationStatus_Unknown;
     result.error = strdup("Error while initializing Kernel isolate");
     return result;
   }
 
   KernelCompilationRequest request;
-  return request.SendAndWaitForResponse(kernel_port, script_uri,
-                                        source_file_count, source_files);
+  return request.SendAndWaitForResponse(kernel_port, script_uri);
 }
 
 
 #endif  // DART_PRECOMPILED_RUNTIME
 
 }  // namespace dart