Fix parsing of ClosureCreation kernel nodes in VM.

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"
 
@@ skipping 678 matching lines @@
       VisitExpression();     // read vector expression.
       builder_->ReadUInt();  // read index.
       VisitExpression();     // read value.
       return;
     case kVectorCopy:
       VisitExpression();  // read vector expression.
       return;
     case kClosureCreation:
       builder_->SkipCanonicalNameReference();  // read function reference.
       VisitExpression();                       // read context vector.
-      VisitDartType();  // read function type of the closure.
+      VisitDartType();                  // read function type of the closure.
+      builder_->SkipListOfDartTypes();  // read type arguments

[Dmitry Stefantsov, 2017/07/31 15:15:06]

As I mentioned, we maintain these comments related to reading the code from the
.dill file.  The purpose is to make the readings more visible, but also to point
to the parts of AST nodes that are being read.  The informal format is (as I
understood it from the chats with @jensj) is this:

// read|skip <name of the field turned in to words with spaces between them>.

So, the full-stop at the end is missing :)

[sjindel, 2017/07/31 15:44:30]

Done.

       return;
     default:
       UNREACHABLE();
   }
 }
 
 void StreamingScopeBuilder::VisitStatement() {
   Tag tag = builder_->ReadTag();  // read tag.
   switch (tag) {
     case kInvalidStatement:
@@ skipping 3292 matching lines @@
       ReadUInt();        // read index.
       SkipExpression();  // read value.
       return;
     case kVectorCopy:
       SkipExpression();  // read vector expression.
       return;
     case kClosureCreation:
       SkipCanonicalNameReference();  // read top-level function reference.
       SkipExpression();              // read context vector.
       SkipDartType();                // read function type.
+      SkipListOfDartTypes();         // read type arguments

[Dmitry Stefantsov, 2017/07/31 15:15:06]

Please, add a full-stop at the end.

[sjindel, 2017/07/31 15:44:30]

Done.

       return;
     case kBigIntLiteral:
       SkipStringReference();  // read string reference.
       return;
     case kStringLiteral:
       SkipStringReference();  // read string reference.
       return;
     case kSpecialIntLiteral:
       return;
     case kNegativeIntLiteral:
@@ skipping 1875 matching lines @@
       StoreInstanceField(TokenPosition::kNoSource, Closure::function_offset());
 
   instructions += LoadLocal(closure);
   instructions += LoadLocal(context);
   instructions +=
       StoreInstanceField(TokenPosition::kNoSource, Closure::context_offset());
 
   instructions += Drop();
 
   SkipDartType();  // skip function type of the closure.
+  SkipListOfDartTypes();  // skip list of type arguments (for now)

[Dmitry Stefantsov, 2017/07/31 15:15:06]

Please, remove "(for now)" and add a full-stop.

[sjindel, 2017/07/31 15:44:30]

Done.

 
   return instructions;
 }
 
 Fragment StreamingFlowGraphBuilder::BuildInvalidStatement() {
   H.ReportError("Invalid statements not implemented yet!");
   return Fragment();
 }
 
 Fragment StreamingFlowGraphBuilder::BuildExpressionStatement() {
@@ skipping 1354 matching lines @@
     }
   }
 
   return Array::Handle(Array::null());
 }
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)