Merge of source position information from kernel-sdk.

runtime/vm/bootstrap.cc

 // Copyright (c) 2012, 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 "vm/bootstrap.h"
 
 #include "include/dart_api.h"
 
 #include "vm/bootstrap_natives.h"
 #include "vm/class_finalizer.h"
@@ skipping 303 matching lines @@
 
   return error.raw();
 }
 
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 static RawError* BootstrapFromKernel(Thread* thread,
                                      const uint8_t* buffer,
                                      intptr_t buffer_size) {
   Zone* zone = thread->zone();
-  kernel::Program* program =
-      ReadPrecompiledKernelFromBuffer(buffer, buffer_size);
+  kernel::KernelReader reader(buffer, buffer_size, true);
+  kernel::Program* program = reader.ReadPrecompiledProgram();
   if (program == NULL) {
     const String& message =
         String::Handle(zone, String::New("Failed to read Kernel file"));
     return ApiError::New(message);
   }
 
   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.
   GrowableObjectArray& pending_classes = GrowableObjectArray::Handle(
       zone, isolate->object_store()->pending_classes());
   dart::Class& pending = dart::Class::Handle(zone);
   for (intptr_t i = 0; i < pending_classes.Length(); ++i) {
     pending ^= pending_classes.At(i);
     pending.set_is_marked_for_parsing();
   }
 
   Library& library = Library::Handle(zone);
   String& dart_name = String::Handle(zone);
   String& kernel_name = String::Handle(zone);
-  kernel::KernelReader reader(NULL, -1, true);
   for (intptr_t i = 0; i < kBootstrapLibraryCount; ++i) {
     ObjectStore::BootstrapLibraryId id = bootstrap_libraries[i].index;
     library = isolate->object_store()->bootstrap_library(id);
     dart_name = library.url();
     for (intptr_t j = 0; j < program->libraries().length(); ++j) {
       kernel::Library* kernel_library = program->libraries()[j];
       kernel::String* uri = kernel_library->import_uri();
       kernel_name = Symbols::FromUTF8(thread, uri->buffer(), uri->size());
       if (kernel_name.Equals(dart_name)) {
         reader.ReadLibrary(kernel_library);
@@ skipping 39 matching lines @@
       isolate->object_store()->set_bootstrap_library(id, lib);
     }
   }
 
   return (kernel_buffer == NULL)
              ? BootstrapFromSource(thread)
              : BootstrapFromKernel(thread, kernel_buffer, kernel_buffer_length);
 }
 
 }  // namespace dart