Use Kernel frontend from run_vm_tests.

runtime/vm/unit_test.cc

 // Copyright (c) 2012, 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/unit_test.h"
 
 #include <stdio.h>
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
@@ skipping 10 matching lines @@
 #include "vm/parser.h"
 #include "vm/symbols.h"
 #include "vm/thread.h"
 #include "vm/virtual_memory.h"
 
 using dart::bin::Builtin;
 using dart::bin::DartUtils;
 
 namespace dart {
 
+DECLARE_FLAG(bool, use_dart_frontend);
+
 TestCaseBase* TestCaseBase::first_ = NULL;
 TestCaseBase* TestCaseBase::tail_ = NULL;
 
 
 TestCaseBase::TestCaseBase(const char* name)
     : raw_test_(false), next_(NULL), name_(name) {
   if (first_ == NULL) {
     first_ = this;
   } else {
     tail_->next_ = this;
@@ skipping 210 matching lines @@
   Dart_Handle source = DartUtils::ReadStringFromFile(resolved_url_chars);
   EXPECT_VALID(source);
   if (tag == Dart_kImportTag) {
     return Dart_LoadLibrary(url, resolved_url, source, 0, 0);
   } else {
     ASSERT(tag == Dart_kSourceTag);
     return Dart_LoadSource(library, url, resolved_url, source, 0, 0);
   }
 }
 
-
-Dart_Handle TestCase::LoadTestScript(const char* script,
-                                     Dart_NativeEntryResolver resolver,
-                                     const char* lib_url,
-                                     bool finalize_classes) {
+static Dart_Handle LoadTestScriptWithVMParser(const char* script,
+                                              Dart_NativeEntryResolver resolver,
+                                              const char* lib_url,
+                                              bool finalize_classes) {
   Dart_Handle url = NewString(lib_url);
   Dart_Handle source = NewString(script);
   Dart_Handle result = Dart_SetLibraryTagHandler(LibraryTagHandler);
   EXPECT_VALID(result);
   Dart_Handle lib = Dart_LoadScript(url, Dart_Null(), source, 0, 0);
   DART_CHECK_VALID(lib);
   result = Dart_SetNativeResolver(lib, resolver, NULL);
   DART_CHECK_VALID(result);
   if (finalize_classes) {
     result = Dart_FinalizeLoading(false);
     DART_CHECK_VALID(result);
   }
   return lib;
 }
 
+static char* Concat(const char* s1, const char* s2) {
+  int len = strlen(s1) + strlen(s2);
+  char* filename = new char[len + 1];
+  snprintf(filename, len + 1, "%s%s", s1, s2);
+  return filename;
+}

[siva, 2017/05/18 00:02:38]

The Concat function above may not be needed if you use OS::SCreate....

[aam, 2017/05/18 01:03:00]

Done.

+
+Dart_Handle TestCase::LoadTestScript(const char* script,
+                                     Dart_NativeEntryResolver resolver,
+                                     const char* lib_url,
+                                     bool finalize_classes) {
+  if (!FLAG_use_dart_frontend) {
+    return LoadTestScriptWithVMParser(script, resolver, lib_url,
+                                      finalize_classes);
+  }

[siva, 2017/05/18 00:02:38]

  Zone* zone = Thread::Current()->zone();

[aam, 2017/05/18 01:03:00]

Done.

+
+  char* filename = Concat("file:///", lib_url);

[siva, 2017/05/18 00:02:39]

char* filename = OS::SCreate(zone, "file:///", lib_url);

[aam, 2017/05/18 01:03:00]

Done.

+  // clang-format off
+  Dart_SourceFile sourcefiles[] = {
+    {
+      filename, script,
+    },
+    {
+      "file:///.packages", "untitled:/"
+    }};
+  // clang-format on
+
+  int sourcefiles_count = sizeof(sourcefiles) / sizeof(Dart_SourceFile);
+  Dart_KernelCompilationResult compilation_result =
+      Dart_CompileSourcesToKernel(filename, sourcefiles_count, sourcefiles);
+  delete[] filename;

[siva, 2017/05/18 00:02:38]

delete not needed as 'filename' would be zone allocated.

[aam, 2017/05/18 01:03:00]

Awesome, done!

+
+  EXPECT(compilation_result.status == Dart_KernelCompilationStatus_Ok)

[siva, 2017/05/18 00:02:38]

The EXPECT above would also print an error message, I think we can get rid of
the expect and just rely on your explicit check below.

[aam, 2017/05/18 01:03:01]

Right, done.

+  if (compilation_result.status != Dart_KernelCompilationStatus_Ok) {
+    OS::PrintErr("Compilation failed %s", compilation_result.error);
+    return NULL;

[siva, 2017/05/18 00:02:38]

should return a Dart_Handle not NULL

return Dart_ApiNewError(OS::SCreate(
    Thread::Current()->zone(), "Compilation failed %s",
compilation_result.error));

[aam, 2017/05/18 01:03:01]

Oh, nice! Done.

+  }
+  const uint8_t* kernel_file = compilation_result.kernel;
+  intptr_t kernel_length = compilation_result.kernel_size;
+  EXPECT(kernel_file != NULL);

[siva, 2017/05/18 00:02:38]

Should this be ASSERT(kernel_file != NULL);

or 
if (kernel_file == NULL) {
    return Dart_ApiNewError(OS::SCreate(Thread::Current()->zone(), "front end
generated a NULL kernel file"));
}

[aam, 2017/05/18 01:03:01]

Yes, I like this better!

+  void* kernel_program = Dart_ReadKernelBinary(kernel_file, kernel_length);
+  EXPECT(kernel_program != NULL);

[siva, 2017/05/18 00:02:38]

Ditto comment about this check here, should return a Dart_Handle

[aam, 2017/05/18 01:03:01]

Done!

+  return Dart_LoadKernel(kernel_program);
+}
 
 #ifndef PRODUCT
 
 
 void TestCase::SetReloadTestScript(const char* script) {
   if (script_reload_key == kUnsetThreadLocalKey) {
     script_reload_key = OSThread::CreateThreadLocal();
   }
   ASSERT(script_reload_key != kUnsetThreadLocalKey);
   ASSERT(OSThread::GetThreadLocal(script_reload_key) == 0);
@@ skipping 201 matching lines @@
   }
   // Copy the remainder of in to out.
   while (*in != '\0') {
     *out++ = *in++;
   }
   *out = '\0';
 }
 
 
 }  // namespace dart