commit 2b473c4fac07fb66debe3b9ba384c5a73d0bf078
author Vyacheslav Egorov <vegorov@google.com> Sat Jul 14 08:21:05 2018 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Sat Jul 14 08:21:05 2018 +0000
tree aea2231ccc560d4703dd3ec51f2409122d1500aa
parent ffeee8fe1033e78ee7a5975bd505781c5907dad4

[vm/reload] Permit reloads in the absence of main method

Some embedders don't use main(...) as an entry point to their code but
still want to be able to reload the code.

Change-Id: I1aafe8b904bff911f383f27fb330f92981841bd9
Reviewed-on: https://dart-review.googlesource.com/64846
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Vyacheslav Egorov <vegorov@google.com>

runtime/vm/isolate_reload.cc

diff --git a/runtime/vm/isolate_reload.cc b/runtime/vm/isolate_reload.cc
index 766127d..33d0316 100644
--- a/runtime/vm/isolate_reload.cc
+++ b/runtime/vm/isolate_reload.cc
@@ -695,6 +695,12 @@
     if (!tmp.IsError()) {
       Library& lib = Library::Handle(thread->zone());
       lib ^= tmp.raw();
+      // If main method disappeared or were not there to begin with then
+      // KernelLoader will return null. In this case lookup library by
+      // URL.
+      if (lib.IsNull()) {
+        lib = Library::LookupLibrary(thread, root_lib_url);
+      }
       isolate()->object_store()->set_root_library(lib);
       FinalizeLoading();
       result = Object::null();