Index: runtime/vm/isolate_reload.cc |
diff --git a/runtime/vm/isolate_reload.cc b/runtime/vm/isolate_reload.cc |
index 4cd67c596e9b5732a6b8fe824b2c01f1ad0044fb..20f80c839ce07fca3d11b386739ca427eec9147c 100644 |
--- a/runtime/vm/isolate_reload.cc |
+++ b/runtime/vm/isolate_reload.cc |
@@ -10,7 +10,7 @@ |
#include "vm/dart_api_impl.h" |
#include "vm/hash_table.h" |
#include "vm/isolate.h" |
-#include "vm/kernel_reader.h" |
+#include "vm/kernel_loader.h" |
#include "vm/log.h" |
#include "vm/object.h" |
#include "vm/object_store.h" |
@@ -570,8 +570,8 @@ void IsolateReloadContext::Reload(bool force_reload, |
ASSERT(data_len == 1); |
kernel_program = reinterpret_cast<kernel::Program*>(data); |
Dart_TypedDataReleaseData(retval); |
- kernel::KernelReader reader(kernel_program); |
- reader.FindModifiedLibraries(I, modified_libs_, force_reload); |
+ kernel::KernelLoader loader(kernel_program); |
+ loader.FindModifiedLibraries(I, modified_libs_, force_reload); |
} |
} |
if (result.IsError()) { |
@@ -642,9 +642,9 @@ void IsolateReloadContext::Reload(bool force_reload, |
// propagating the UnwindError or an UnhandledException error. |
if (isolate()->use_dart_frontend()) { |
- // Read the kernel program. |
- kernel::KernelReader reader(kernel_program); |
- const Object& tmp = reader.ReadProgram(); |
+ // Load the kernel program. |
+ kernel::KernelLoader loader(kernel_program); |
+ const Object& tmp = loader.LoadProgram(); |
if (!tmp.IsError()) { |
Library& lib = Library::Handle(thread->zone()); |
lib ^= tmp.raw(); |