| Index: runtime/vm/bootstrap_nocore.cc
|
| diff --git a/runtime/vm/bootstrap_nocore.cc b/runtime/vm/bootstrap_nocore.cc
|
| index 192ec678eea3e988797165dc5a747eab58c19da0..0ce23803717231ee1924fb1a4296b7a50449e25e 100644
|
| --- a/runtime/vm/bootstrap_nocore.cc
|
| +++ b/runtime/vm/bootstrap_nocore.cc
|
| @@ -9,7 +9,7 @@
|
| #if !defined(DART_PRECOMPILED_RUNTIME)
|
| #include "vm/class_finalizer.h"
|
| #include "vm/compiler.h"
|
| -#include "vm/kernel_reader.h"
|
| +#include "vm/kernel_loader.h"
|
| #endif
|
| #include "vm/object.h"
|
| #if !defined(DART_PRECOMPILED_RUNTIME)
|
| @@ -70,7 +70,7 @@ void Finish(Thread* thread, bool from_kernel) {
|
|
|
| RawError* BootstrapFromKernel(Thread* thread, kernel::Program* program) {
|
| Zone* zone = thread->zone();
|
| - kernel::KernelReader reader(program);
|
| + kernel::KernelLoader loader(program);
|
| Isolate* isolate = thread->isolate();
|
| // Mark the already-pending classes. This mark bit will be used to avoid
|
| // adding classes to the list more than once.
|
| @@ -90,9 +90,9 @@ RawError* BootstrapFromKernel(Thread* thread, kernel::Program* program) {
|
| library = isolate->object_store()->bootstrap_library(id);
|
| dart_name = library.url();
|
| for (intptr_t j = 0; j < program->library_count(); ++j) {
|
| - const String& kernel_name = reader.LibraryUri(j);
|
| + const String& kernel_name = loader.LibraryUri(j);
|
| if (kernel_name.Equals(dart_name)) {
|
| - reader.ReadLibrary(reader.library_offset(j));
|
| + loader.LoadLibrary(loader.library_offset(j));
|
| library.SetLoaded();
|
| break;
|
| }
|
| @@ -104,7 +104,7 @@ RawError* BootstrapFromKernel(Thread* thread, kernel::Program* program) {
|
|
|
| // The platform binary may contain other libraries (e.g., dart:_builtin or
|
| // dart:io) that will not be bundled with application. Load them now.
|
| - reader.ReadProgram();
|
| + loader.LoadProgram();
|
|
|
| // The builtin library should be registered with the VM.
|
| dart_name = String::New("dart:_builtin");
|
|
|