Revert two Kernel changes that were causing test failures.

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 842 matching lines @@
  public:
   enum Fields {
     kStart,  // tag.
     kCanonicalName,
     kPosition,
     kEndPosition,
     kFlags,
     kParentClassBinaryOffset,
     kName,
     kSourceUriIndex,
-    kDocumentationCommentIndex,
     kAnnotations,
     kType,
     kInitializer,
     kEnd
   };
 
   explicit FieldHelper(StreamingFlowGraphBuilder* builder)
       : builder_(builder),
         next_read_(kStart),
         has_function_literal_initializer_(false) {}
@@ skipping 39 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 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) {
           builder_->SkipExpression();  // read ith expression.
         }
         if (++next_read_ == field) return;
       }
       case kType:
         builder_->SkipDartType();  // read type.
         if (++next_read_ == field) return;
@@ skipping 70 matching lines @@
   enum Fields {
     kStart,  // tag.
     kCanonicalName,
     kPosition,
     kEndPosition,
     kKind,
     kFlags,
     kParentClassBinaryOffset,
     kName,
     kSourceUriIndex,
-    kDocumentationCommentIndex,
     kAnnotations,
     kFunction,
     kEnd
   };
 
   explicit ProcedureHelper(StreamingFlowGraphBuilder* builder) {
     builder_ = builder;
     next_read_ = kStart;
   }
 
@@ skipping 34 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 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) {
           builder_->SkipExpression();  // read ith expression.
         }
         if (++next_read_ == field) return;
       }
       case kFunction:
         if (builder_->ReadTag() == kSomething)
           builder_->SkipFunctionNode();  // read function node.
@@ skipping 46 matching lines @@
 class ConstructorHelper {
  public:
   enum Fields {
     kStart,  // tag.
     kCanonicalName,
     kPosition,
     kEndPosition,
     kFlags,
     kParentClassBinaryOffset,
     kName,
-    kDocumentationCommentIndex,
     kAnnotations,
     kFunction,
     kInitializers,
     kEnd
   };
 
   explicit ConstructorHelper(StreamingFlowGraphBuilder* builder) {
     builder_ = builder;
     next_read_ = kStart;
   }
@@ skipping 25 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 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) {
           builder_->SkipExpression();  // read ith expression.
         }
         if (++next_read_ == field) return;
       }
       case kFunction:
         builder_->SkipFunctionNode();  // read function.
         if (++next_read_ == field) return;
@@ skipping 344 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_