Load vmservice from a .dill file when generating AOT snapshots.

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2013, 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 "include/dart_api.h"
 #include "include/dart_mirrors_api.h"
 #include "include/dart_native_api.h"
 
 #include "lib/stacktrace.h"
 #include "platform/assert.h"
@@ skipping 42 matching lines @@
 #include "vm/uri.h"
 #include "vm/verifier.h"
 #include "vm/version.h"
 
 namespace dart {
 
 // Facilitate quick access to the current zone once we have the current thread.
 #define Z (T->zone())
 
 
+DECLARE_FLAG(bool, use_dart_frontend);
 DECLARE_FLAG(bool, print_class_table);
 DECLARE_FLAG(bool, verify_handles);
 #if defined(DART_NO_SNAPSHOT)
 DEFINE_FLAG(bool,
             check_function_fingerprints,
             true,
             "Check function fingerprints");
 #endif  // defined(DART_NO_SNAPSHOT).
 DEFINE_FLAG(bool,
             verify_acquired_data,
@@ skipping 5562 matching lines @@
   for (intptr_t i = 0; i < pending_deferred_loads.Length(); i++) {
     if (pending_deferred_loads.At(i) == lib.raw()) {
       lib.SetLoadError(err);
       return Api::Null();
     }
   }
   return error_in;
 }
 
 
+#if !defined(DART_PRECOMPILED_RUNTIME)
+static Dart_Handle LoadLibraryFromKernel(Thread* T, void* kernel_program) {

[siva, 2017/06/22 23:51:37]

Is it LoadLibraryFromKernel or LoadKernelProgram as we can also use this
abstraction for LoadScript.

[sivachandra, 2017/06/23 01:14:57]

Done.

+  kernel::KernelReader reader(
+      reinterpret_cast<kernel::Program*>(kernel_program));
+  const Object& tmp = reader.ReadProgram();
+  if (tmp.IsError()) {
+    return Api::NewHandle(T, tmp.raw());
+  }
+
+  Library& library = Library::Handle(T->zone());
+  library ^= tmp.raw();
+  return Api::NewHandle(T, library.raw());

[siva, 2017/06/22 23:51:37]

I think currently reader.ReadProgram returns the library that has 'main' in it
otherwise it returns null.

You may have to instead call Library::LookupLibrary(T, url) to get the library
object and return it.

[sivachandra, 2017/06/23 01:14:57]

Done.

+}
+#endif
+
+
 DART_EXPORT Dart_Handle Dart_LoadLibrary(Dart_Handle url,
                                          Dart_Handle resolved_url,
                                          Dart_Handle source,
                                          intptr_t line_offset,
                                          intptr_t column_offset) {
   API_TIMELINE_DURATION;
   DARTSCOPE(Thread::Current());
   Isolate* I = T->isolate();
+
+#if !defined(DART_PRECOMPILED_RUNTIME)
+  // Kernel isolate is loaded from script in case of dart_bootstrap
+  // even when FLAG_use_dart_frontend is true. Hence, do not interpret
+  // |source| as a kernel if the current isolate is the kernel isolate.
+  if (FLAG_use_dart_frontend && !KernelIsolate::IsKernelIsolate(I)) {
+    return LoadLibraryFromKernel(T, reinterpret_cast<void*>(source));
+  }
+#endif
+
   const String& url_str = Api::UnwrapStringHandle(Z, url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(Z, url, String);
   }
   if (::Dart_IsNull(resolved_url)) {
     resolved_url = url;
   }
   const String& resolved_url_str = Api::UnwrapStringHandle(Z, resolved_url);
   if (resolved_url_str.IsNull()) {
     RETURN_TYPE_ERROR(Z, resolved_url, String);
@@ skipping 1301 matching lines @@
 }
 
 
 DART_EXPORT void Dart_DumpNativeStackTrace(void* context) {
 #ifndef PRODUCT
   Profiler::DumpStackTrace(context);
 #endif
 }
 
 }  // namespace dart