Allow the VM to read Kernel files with external libraries

runtime/vm/kernel_binary_flowgraph.cc

 // Copyright (c) 2016, 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/kernel_binary_flowgraph.h"
 #include "vm/compiler.h"
 #include "vm/longjump.h"
 #include "vm/object_store.h"
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
@@ skipping 69 matching lines @@
 
   // Ordered with fall-through.
   switch (next_read_) {
     case kPosition:
       position_ = builder_->ReadPosition();  // read position.
       if (++next_read_ == field) return;
     case kEqualPosition:
       equals_position_ = builder_->ReadPosition();  // read equals position.
       if (++next_read_ == field) return;
     case kFlags:
-      flags_ = builder_->ReadFlags();  // read flags.
+      flags_ = builder_->ReadFlags();
       if (++next_read_ == field) return;
     case kNameIndex:
       name_index_ = builder_->ReadStringReference();  // read name index.
       if (++next_read_ == field) return;
     case kType:
       builder_->SkipDartType();  // read type.
       if (++next_read_ == field) return;
     case kInitializer:
       if (builder_->ReadTag() == kSomething)
         builder_->SkipExpression();  // read initializer.
@@ skipping 25 matching lines @@
       canonical_name_ =
           builder_->ReadCanonicalNameReference();  // read canonical_name.
       if (++next_read_ == field) return;
     case kPosition:
       position_ = builder_->ReadPosition(false);  // read position.
       if (++next_read_ == field) return;
     case kEndPosition:
       end_position_ = builder_->ReadPosition(false);  // read end position.
       if (++next_read_ == field) return;
     case kFlags:
-      flags_ = builder_->ReadFlags();  // read flags.
+      flags_ = builder_->ReadFlags();
       if (++next_read_ == field) return;
     case kName:
       builder_->SkipName();  // read name.
       if (++next_read_ == field) return;
     case kSourceUriIndex:
       source_uri_index_ = builder_->ReadUInt();  // read source_uri_index.
       builder_->current_script_id_ = source_uri_index_;
       builder_->record_token_position(position_);
       builder_->record_token_position(end_position_);
       if (++next_read_ == field) return;
@@ skipping 51 matching lines @@
     case kPosition:
       position_ = builder_->ReadPosition(false);  // read position.
       if (++next_read_ == field) return;
     case kEndPosition:
       end_position_ = builder_->ReadPosition(false);  // read end position.
       if (++next_read_ == field) return;
     case kKind:
       kind_ = static_cast<Kind>(builder_->ReadByte());
       if (++next_read_ == field) return;
     case kFlags:
-      flags_ = builder_->ReadFlags();  // read flags.
+      flags_ = builder_->ReadFlags();
       if (++next_read_ == field) return;
     case kName:
       builder_->SkipName();  // read name.
       if (++next_read_ == field) return;
     case kSourceUriIndex:
       source_uri_index_ = builder_->ReadUInt();  // read source_uri_index.
       builder_->current_script_id_ = source_uri_index_;
       builder_->record_token_position(position_);
       builder_->record_token_position(end_position_);
       if (++next_read_ == field) return;
@@ skipping 30 matching lines @@
       canonical_name_ =
           builder_->ReadCanonicalNameReference();  // read canonical_name.
       if (++next_read_ == field) return;
     case kPosition:
       position_ = builder_->ReadPosition();  // read position.
       if (++next_read_ == field) return;
     case kEndPosition:
       end_position_ = builder_->ReadPosition();  // read end position.
       if (++next_read_ == field) return;
     case kFlags:
-      flags_ = builder_->ReadFlags();  // read flags.
+      flags_ = builder_->ReadFlags();
       if (++next_read_ == field) return;
     case kName:
       builder_->SkipName();  // read name.
       if (++next_read_ == field) return;
     case kDocumentationCommentIndex:
       builder_->ReadStringReference();
       if (++next_read_ == field) return;
     case kAnnotations: {
       annotation_count_ = builder_->ReadListLength();  // read list length.
       for (intptr_t i = 0; i < annotation_count_; ++i) {
@@ skipping 133 matching lines @@
       return;
   }
 }
 
 void LibraryHelper::ReadUntilExcluding(Field field) {
   if (field <= next_read_) return;
 
   // Ordered with fall-through.
   switch (next_read_) {
     case kFlags: {
-      word flags = builder_->ReadFlags();  // read flags.
-      ASSERT(flags == 0);                  // external libraries not supported
+      flags_ = builder_->ReadFlags();
       if (++next_read_ == field) return;
     }
     case kCanonicalName:
       canonical_name_ =
           builder_->ReadCanonicalNameReference();  // read canonical_name.
       if (++next_read_ == field) return;
     case kName:
       name_index_ = builder_->ReadStringReference();  // read name index.
       if (++next_read_ == field) return;
     case kSourceUriIndex:
@@ skipping 4228 matching lines @@
 
 void StreamingFlowGraphBuilder::SkipLibraryCombinator() {
   ReadBool();                        // read is_show.
   intptr_t name_count = ReadUInt();  // read list length.
   for (intptr_t j = 0; j < name_count; ++j) {
     ReadUInt();  // read ith entry of name_indices.
   }
 }
 
 void StreamingFlowGraphBuilder::SkipLibraryDependency() {
-  ReadFlags();                                   // read flags.
-  SkipListOfExpressions();                       // Read annotations.
-  ReadCanonicalNameReference();                  // read target_reference.
-  ReadStringReference();                         // read name_index.
-  intptr_t combinator_count = ReadListLength();  // read list length.
+  ReadFlags();
+  SkipListOfExpressions();  // Annotations.
+  ReadCanonicalNameReference();
+  ReadStringReference();  // Name.
+  intptr_t combinator_count = ReadListLength();
   for (intptr_t i = 0; i < combinator_count; ++i) {
     SkipLibraryCombinator();
   }
 }
 
 void StreamingFlowGraphBuilder::SkipLibraryPart() {
   SkipListOfExpressions();  // Read annotations.
   ReadStringReference();    // read uri_index.
 }
 
@@ skipping 29 matching lines @@
 }
 
 Tag StreamingFlowGraphBuilder::ReadTag(uint8_t* payload) {
   return reader_->ReadTag(payload);
 }
 
 Tag StreamingFlowGraphBuilder::PeekTag(uint8_t* payload) {
   return reader_->PeekTag(payload);
 }
 
-word StreamingFlowGraphBuilder::ReadFlags() {
-  return reader_->ReadFlags();
-}
-
 void StreamingFlowGraphBuilder::loop_depth_inc() {
   ++flow_graph_builder_->loop_depth_;
 }
 
 void StreamingFlowGraphBuilder::loop_depth_dec() {
   --flow_graph_builder_->loop_depth_;
 }
 
 intptr_t StreamingFlowGraphBuilder::for_in_depth() {
   return flow_graph_builder_->for_in_depth_;
@@ skipping 3067 matching lines @@
     }
   }
 
   return Array::Handle(Array::null());
 }
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)