Correctly set root_library based on the application script URI instead of looking for the library t…

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 44 matching lines @@
 #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);
+DECLARE_FLAG(bool, use_dart_frontend);
 #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,
             false,
             "Verify correct API acquire/release of typed data.");
@@ skipping 4924 matching lines @@
   if (error.IsNull()) {
     *result = Api::NewHandle(thread, lib.raw());
   } else {
     *result = Api::NewHandle(thread, error.raw());
     // Compilation errors are not Dart instances, so just mark the library
     // as having failed to load without providing an error instance.
     lib.SetLoadError(Object::null_instance());
   }
 }
 
+#if !defined(DART_PRECOMPILED_RUNTIME)
+static Dart_Handle LoadKernelProgram(Thread* T,
+                                     const String& url,
+                                     void* kernel) {
+  // NOTE: Now the VM owns the [kernel_program] memory!  Currently we do not
+  // free it because (similar to the token stream) it will be used to repeatedly
+  // run the `kernel::FlowGraphBuilder()`.
+  kernel::KernelReader reader(reinterpret_cast<kernel::Program*>(kernel));
+  const Object& tmp = reader.ReadProgram();
+  if (tmp.IsError()) {
+    return Api::NewHandle(T, tmp.raw());
+  }
+  return Dart_Null();
+}
+#endif
+
 DART_EXPORT Dart_Handle Dart_LoadScript(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();
   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);
   }
-  const String& source_str = Api::UnwrapStringHandle(Z, source);
-  if (source_str.IsNull()) {
-    RETURN_TYPE_ERROR(Z, source, String);
-  }
   Library& library = Library::Handle(Z, I->object_store()->root_library());
   if (!library.IsNull()) {
     const String& library_url = String::Handle(Z, library.url());
     return Api::NewError("%s: A script has already been loaded from '%s'.",
                          CURRENT_FUNC, library_url.ToCString());
   }
   if (line_offset < 0) {
     return Api::NewError("%s: argument 'line_offset' must be positive number",
                          CURRENT_FUNC);
   }
   if (column_offset < 0) {
     return Api::NewError("%s: argument 'column_offset' must be positive number",
                          CURRENT_FUNC);
   }
   CHECK_CALLBACK_STATE(T);
   CHECK_COMPILATION_ALLOWED(I);
 
+  Dart_Handle result;
+#if !defined(DART_PRECOMPILED_RUNTIME)
+  if (FLAG_use_dart_frontend && !KernelIsolate::IsKernelIsolate(I)) {
+    if ((source == Api::Null()) || (source == NULL)) {
+      RETURN_NULL_ERROR(source);
+    }
+    void* kernel_pgm = reinterpret_cast<void*>(source);
+    result = LoadKernelProgram(T, resolved_url_str, kernel_pgm);
+    if (Dart_IsError(result)) {
+      return result;
+    }
+    library ^= Library::LookupLibrary(T, resolved_url_str);
+    if (library.IsNull()) {
+      return Api::NewError("%s: Unable to load script '%s' correctly.",
+                           CURRENT_FUNC, resolved_url_str.ToCString());
+    }
+    I->object_store()->set_root_library(library);
+    return Api::NewHandle(T, library.raw());
+  }
+#endif
+
+  const String& source_str = Api::UnwrapStringHandle(Z, source);
+  if (source_str.IsNull()) {
+    RETURN_TYPE_ERROR(Z, source, String);
+  }
+
   NoHeapGrowthControlScope no_growth_control;
 
   library = Library::New(url_str);
   library.set_debuggable(true);
   library.Register(T);
   I->object_store()->set_root_library(library);
 
   const Script& script =
       Script::Handle(Z, Script::New(url_str, resolved_url_str, source_str,
                                     RawScript::kScriptTag));
   script.SetLocationOffset(line_offset, column_offset);
-  Dart_Handle result;
   CompileSource(T, library, script, &result);
   return result;
 }
 
 DART_EXPORT Dart_Handle Dart_LoadScriptFromSnapshot(const uint8_t* buffer,
                                                     intptr_t buffer_len) {
   API_TIMELINE_DURATION;
   DARTSCOPE(Thread::Current());
   Isolate* I = T->isolate();
   StackZone zone(T);
@@ skipping 284 matching lines @@
                                   I->object_store()->pending_deferred_loads());
   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 LoadKernelProgram(Dart_Handle url, Thread* T, void* kernel) {
-  kernel::KernelReader reader(reinterpret_cast<kernel::Program*>(kernel));
-  const Object& tmp = reader.ReadProgram();
-  if (tmp.IsError()) {
-    return Api::NewHandle(T, tmp.raw());
-  }
-
-  const String& url_str = Api::UnwrapStringHandle(Z, url);
-  Library& library =
-      Library::Handle(T->zone(), Library::LookupLibrary(T, url_str));
-  return Api::NewHandle(T, library.raw());
-}
-#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();
 
+  const String& url_str = Api::UnwrapStringHandle(Z, url);
+  if (url_str.IsNull()) {
+    RETURN_TYPE_ERROR(Z, url, String);
+  }
+  Dart_Handle result;
 #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 LoadKernelProgram(url, T, reinterpret_cast<void*>(source));
+    result = LoadKernelProgram(T, url_str, reinterpret_cast<void*>(source));
+    if (Dart_IsError(result)) {
+      return result;
+    }
+    return Api::NewHandle(T, Library::LookupLibrary(T, url_str));
   }
 #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);
   }
   const String& source_str = Api::UnwrapStringHandle(Z, source);
   if (source_str.IsNull()) {
     RETURN_TYPE_ERROR(Z, source, String);
@@ skipping 19 matching lines @@
              library.LoadFailed()) {
     // The source for this library has either been loaded or is in the
     // process of loading.  Return an error.
     return Api::NewError("%s: library '%s' has already been loaded.",
                          CURRENT_FUNC, url_str.ToCString());
   }
   const Script& script =
       Script::Handle(Z, Script::New(url_str, resolved_url_str, source_str,
                                     RawScript::kLibraryTag));
   script.SetLocationOffset(line_offset, column_offset);
-  Dart_Handle result;
   CompileSource(T, library, script, &result);
   // Propagate the error out right now.
   if (::Dart_IsError(result)) {
     return result;
   }
 
   // If this is the dart:_builtin library, register it with the VM.
   if (url_str.Equals("dart:_builtin")) {
     I->object_store()->set_builtin_library(library);
     Dart_Handle state = Api::CheckAndFinalizePendingClasses(T);
@@ skipping 1218 matching lines @@
 #endif
 }
 
 DART_EXPORT void Dart_DumpNativeStackTrace(void* context) {
 #ifndef PRODUCT
   Profiler::DumpStackTrace(context);
 #endif
 }
 
 }  // namespace dart