Allow the VM to read Kernel files with external libraries

runtime/vm/kernel_binary_flowgraph.h

 // Copyright (c) 2017, 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.
 
 #ifndef RUNTIME_VM_KERNEL_BINARY_FLOWGRAPH_H_
 #define RUNTIME_VM_KERNEL_BINARY_FLOWGRAPH_H_
 
 #if !defined(DART_PRECOMPILED_RUNTIME)
 
 #include <map>
@@ skipping 101 matching lines @@
   void ReadUntilExcluding(Field field);
 
   void SetNext(Field field) { next_read_ = field; }
   void SetJustRead(Field field) { next_read_ = field + 1; }
 
   bool IsConst() { return (flags_ & kConst) != 0; }
   bool IsFinal() { return (flags_ & kFinal) != 0; }
 
   TokenPosition position_;
   TokenPosition equals_position_;
-  word flags_;
+  uint8_t flags_;
   StringIndex name_index_;
 
  private:
   StreamingFlowGraphBuilder* builder_;
   intptr_t next_read_;
 };
 
 // Helper class that reads a kernel Field from binary.
 //
 // Use ReadUntilExcluding to read up to but not including a field.
@@ skipping 50 matching lines @@
     if (has_function_literal_initializer_) {
       *start = function_literal_start_;
       *end = function_literal_end_;
     }
     return has_function_literal_initializer_;
   }
 
   NameIndex canonical_name_;
   TokenPosition position_;
   TokenPosition end_position_;
-  word flags_;
+  uint8_t flags_;
   intptr_t source_uri_index_;
   intptr_t annotation_count_;
 
  private:
   StreamingFlowGraphBuilder* builder_;
   intptr_t next_read_;
 
   bool has_function_literal_initializer_;
   TokenPosition function_literal_start_;
   TokenPosition function_literal_end_;
@@ skipping 54 matching lines @@
 
   bool IsStatic() { return (flags_ & kStatic) != 0; }
   bool IsAbstract() { return (flags_ & kAbstract) != 0; }
   bool IsExternal() { return (flags_ & kExternal) != 0; }
   bool IsConst() { return (flags_ & kConst) != 0; }
 
   NameIndex canonical_name_;
   TokenPosition position_;
   TokenPosition end_position_;
   Kind kind_;
-  word flags_;
+  uint8_t flags_;
   intptr_t source_uri_index_;
   intptr_t annotation_count_;
 
  private:
   StreamingFlowGraphBuilder* builder_;
   intptr_t next_read_;
 };
 
 // Helper class that reads a kernel Constructor from binary.
 //
@@ skipping 36 matching lines @@
 
   void SetNext(Field field) { next_read_ = field; }
   void SetJustRead(Field field) { next_read_ = field + 1; }
 
   bool IsExternal() { return (flags_ & kExternal) != 0; }
   bool IsConst() { return (flags_ & kConst) != 0; }
 
   NameIndex canonical_name_;
   TokenPosition position_;
   TokenPosition end_position_;
-  word flags_;
+  uint8_t flags_;
   intptr_t annotation_count_;
 
  private:
   StreamingFlowGraphBuilder* builder_;
   intptr_t next_read_;
 };
 
 // Helper class that reads a kernel Class from binary.
 //
 // Use ReadUntilExcluding to read up to but not including a field.
@@ skipping 67 matching lines @@
     kAnnotations,
     kDependencies,
     kParts,
     kTypedefs,
     kClasses,
     kToplevelField,
     kToplevelProcedures,
     kEnd,
   };
 
+  enum Flag {
+    kExternal = 1,
+  };
+
   explicit LibraryHelper(StreamingFlowGraphBuilder* builder) {
     builder_ = builder;
     next_read_ = kFlags;
   }
 
   void ReadUntilIncluding(Field field) {
     ReadUntilExcluding(static_cast<Field>(static_cast<int>(field) + 1));
   }
 
   void ReadUntilExcluding(Field field);
 
   void SetNext(Field field) { next_read_ = field; }
   void SetJustRead(Field field) { next_read_ = field + 1; }
 
+  bool IsExternal() const { return (flags_ & kExternal) != 0; }
+
+  uint8_t flags_;
   NameIndex canonical_name_;
   StringIndex name_index_;
   intptr_t source_uri_index_;
 
  private:
   StreamingFlowGraphBuilder* builder_;
   intptr_t next_read_;
 };
 
 class StreamingDartTypeTranslator {
@@ skipping 393 matching lines @@
   void SkipVariableDeclaration();
   void SkipLibraryCombinator();
   void SkipLibraryDependency();
   void SkipLibraryPart();
   void SkipLibraryTypedef();
   TokenPosition ReadPosition(bool record = true);
   void record_token_position(TokenPosition position);
   void record_yield_position(TokenPosition position);
   Tag ReadTag(uint8_t* payload = NULL);
   Tag PeekTag(uint8_t* payload = NULL);
-  word ReadFlags();
+  uint8_t ReadFlags() { return reader_->ReadFlags(); }
 
   void loop_depth_inc();
   void loop_depth_dec();
   intptr_t for_in_depth();
   void for_in_depth_inc();
   void for_in_depth_dec();
   void catch_depth_inc();
   void catch_depth_dec();
   void try_depth_inc();
   void try_depth_dec();
@@ skipping 271 matching lines @@
   const uint8_t* saved_raw_buffer_;
   const TypedData* saved_typed_data_;
   intptr_t saved_offset_;
 };
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)
 #endif  // RUNTIME_VM_KERNEL_BINARY_FLOWGRAPH_H_