[kernel] Only add metadata if there's at least one annotation

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 884 matching lines @@
         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;
-      case kAnnotations:
-        builder_->SkipListOfExpressions();  // read annotations.
+      case kAnnotations: {
+        annotation_count_ = builder_->ReadListLength();  // read list length.
+        for (intptr_t i = 0; i < annotation_count_; ++i) {
+          builder_->SkipExpression();  // read ith expression.
+        }
         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.
         if (++next_read_ == field) return;
       case kEnd:
         return;
     }
@@ skipping 10 matching lines @@
   bool IsStatic() {
     return (flags_ & Field::kFlagStatic) == Field::kFlagStatic;
   }
 
   NameIndex canonical_name_;
   TokenPosition position_;
   TokenPosition end_position_;
   word flags_;
   intptr_t parent_class_binary_offset_;
   intptr_t source_uri_index_;
+  intptr_t annotation_count_;
 
  private:
   StreamingFlowGraphBuilder* builder_;
   intptr_t next_read_;
 };
 
 
 // Helper class that reads a kernel Procedure from binary.
 //
 // Use ReadUntilExcluding to read up to but not including a field.
@@ skipping 60 matching lines @@
         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;
-      case kAnnotations:
-        builder_->SkipListOfExpressions();  // read annotations.
+      case kAnnotations: {
+        annotation_count_ = builder_->ReadListLength();  // read list length.
+        for (intptr_t i = 0; i < annotation_count_; ++i) {
+          builder_->SkipExpression();  // read ith expression.
+        }
         if (++next_read_ == field) return;
+      }
       case kFunction:
         if (builder_->ReadTag() == kSomething)
           builder_->SkipFunctionNode();  // read function node.
         if (++next_read_ == field) return;
       case kEnd:
         return;
     }
   }
 
   void SetNext(Fields field) { next_read_ = field; }
@@ skipping 15 matching lines @@
     return (flags_ & Procedure::kFlagConst) == Procedure::kFlagConst;
   }
 
   NameIndex canonical_name_;
   TokenPosition position_;
   TokenPosition end_position_;
   Procedure::ProcedureKind kind_;
   word flags_;
   intptr_t parent_class_binary_offset_;
   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.
 //
 // Use ReadUntilExcluding to read up to but not including a field.
 // One can then for instance read the field from the call-site (and remember to
@@ skipping 48 matching lines @@
       case kFlags:
         flags_ = builder_->ReadFlags();  // read flags.
         if (++next_read_ == field) return;
       case kParentClassBinaryOffset:
         parent_class_binary_offset_ =
             builder_->ReadUInt();  // read parent class binary offset.
         if (++next_read_ == field) return;
       case kName:
         builder_->SkipName();  // read name.
         if (++next_read_ == field) return;
-      case kAnnotations:
-        builder_->SkipListOfExpressions();  // read annotations.
+      case kAnnotations: {
+        annotation_count_ = builder_->ReadListLength();  // read list length.
+        for (intptr_t i = 0; i < annotation_count_; ++i) {
+          builder_->SkipExpression();  // read ith expression.
+        }
         if (++next_read_ == field) return;
+      }
       case kFunction:
         builder_->SkipFunctionNode();  // read function.
         if (++next_read_ == field) return;
       case kInitializers: {
         intptr_t list_length =
             builder_->ReadListLength();  // read initializers list length.
         for (intptr_t i = 0; i < list_length; i++) {
           Tag tag = builder_->ReadTag();
           switch (tag) {
             case kInvalidInitializer:
@@ skipping 35 matching lines @@
   }
   bool IsConst() {
     return (flags_ & Constructor::kFlagConst) == Constructor::kFlagConst;
   }
 
   NameIndex canonical_name_;
   TokenPosition position_;
   TokenPosition end_position_;
   word flags_;
   intptr_t parent_class_binary_offset_;
+  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.
 // One can then for instance read the field from the call-site (and remember to
@@ skipping 50 matching lines @@
         is_abstract_ = builder_->ReadBool();  // read is_abstract.
         if (++next_read_ == field) return;
       case kNameIndex:
         name_index_ = builder_->ReadStringReference();  // read name index.
         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_);
         if (++next_read_ == field) return;
-      case kAnnotations:
-        builder_->SkipListOfExpressions();  // read annotations.
+      case kAnnotations: {
+        annotation_count_ = builder_->ReadListLength();  // read list length.
+        for (intptr_t i = 0; i < annotation_count_; ++i) {
+          builder_->SkipExpression();  // read ith expression.
+        }
         if (++next_read_ == field) return;
+      }
       case kTypeParameters:
         builder_->SkipTypeParametersList();  // read type parameters.
         if (++next_read_ == field) return;
       case kSuperClass: {
         Tag type_tag = builder_->ReadTag();  // read super class type (part 1).
         if (type_tag == kSomething) {
           builder_->SkipDartType();  // read super class type (part 2).
         }
         if (++next_read_ == field) return;
       }
@@ skipping 45 matching lines @@
   void SetJustRead(Fields field) {
     next_read_ = field;
     ++next_read_;
   }
 
   NameIndex canonical_name_;
   TokenPosition position_;
   bool is_abstract_;
   StringIndex name_index_;
   intptr_t source_uri_index_;
+  intptr_t annotation_count_;
 
  private:
   StreamingFlowGraphBuilder* builder_;
   intptr_t next_read_;
 };
 
 // Helper class that reads a kernel Library from binary.
 //
 // Use ReadUntilExcluding to read up to but not including a field.
 // One can then for instance read the field from the call-site (and remember to
@@ skipping 128 matching lines @@
  private:
   Reader* reader_;
   intptr_t saved_offset_;
 };
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)
 #endif  // RUNTIME_VM_KERNEL_BINARY_FLOWGRAPH_H_