Fix several bugs in closure conversion.

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 1179 matching lines @@
     case kLabeledStatement:
       VisitStatement();  // read body.
       return;
     case kBreakStatement:
       builder_->ReadPosition();  // read position.
       builder_->ReadUInt();      // read target_index.
       return;
     case kWhileStatement:
       ++depth_.loop_;
       builder_->ReadPosition();  // read position.
-      VisitExpression();  // read condition.
-      VisitStatement();   // read body.
+      VisitExpression();         // read condition.
+      VisitStatement();          // read body.
       --depth_.loop_;
       return;
     case kDoStatement:
       ++depth_.loop_;
       builder_->ReadPosition();  // read position.
-      VisitStatement();   // read body.
-      VisitExpression();  // read condition.
+      VisitStatement();          // read body.
+      VisitExpression();         // read condition.
       --depth_.loop_;
       return;
     case kForStatement: {
       PositionScope scope(builder_->reader_);
 
       intptr_t offset =
           builder_->ReaderOffset() - 1;  // -1 to include tag byte.
 
       EnterScope(relative_kernel_offset_ + offset);
 
@@ skipping 2198 matching lines @@
                      argument_names);
 
   // Return the result.
   body += Return(function_node_helper.end_position_);
 
   return new (Z)
       FlowGraph(*parsed_function(), flow_graph_builder_->graph_entry_,
                 flow_graph_builder_->next_block_id_ - 1);
 }
 
+LocalVariable* StreamingFlowGraphBuilder::LookupParameterDirect(
+    intptr_t kernel_offset,
+    intptr_t parameter_index) {
+  LocalVariable* var = LookupVariable(kernel_offset);
+  LocalVariable* parameter =
+      new (Z) LocalVariable(TokenPosition::kNoSource, TokenPosition::kNoSource,
+                            Symbols::TempParam(), var->type());
+  parameter->set_index(parameter_index);
+  if (var->is_captured()) parameter->set_is_captured_parameter(true);
+  return parameter;
+}
 // This method follows the logic of
 // StreamingFlowGraphBuilder::BuildGraphOfImplicitClosureFunction.  For
 // additional details on converted closure functions, please, see the comment on
 // the method Function::ConvertedClosureFunction.
 FlowGraph* StreamingFlowGraphBuilder::BuildGraphOfConvertedClosureFunction(
     const Function& function) {
   const Function& target = Function::ZoneHandle(Z, function.parent_function());
 
   TargetEntryInstr* normal_entry = flow_graph_builder_->BuildTargetEntry();
   flow_graph_builder_->graph_entry_ = new (Z) GraphEntryInstr(
@@ skipping 20 matching lines @@
   function_node_helper.ReadUntilExcluding(
       FunctionNodeHelper::kPositionalParameters);
 
   // Positional.
   const intptr_t positional_argument_count = ReadListLength();
 
   // The first argument is the instance of the closure class.  For converted
   // closures its context field contains the context vector that is used by the
   // converted top-level function (target) explicitly and that should be passed
   // to that function as the first parameter.
-  body += LoadLocal(LookupVariable(
-      ReaderOffset() + relative_kernel_offset_));  // 0th variable offset.
+  intptr_t parameter_index = parsed_function()->first_parameter_index();
+  LocalVariable* parameter = LookupParameterDirect(
+      ReaderOffset() + relative_kernel_offset_, parameter_index--);
+  body += LoadLocal(parameter);  // 0th variable offset.
   body += flow_graph_builder_->LoadField(Closure::context_offset());
   LocalVariable* context = MakeTemporary();
 
   if (type_param_count > 0) {
     body += LoadLocal(context);
     body += flow_graph_builder_->LoadField(Context::variable_offset(0));
     body += PushArgument();
   }
 
   body += LoadLocal(context);
   body += PushArgument();
   SkipVariableDeclaration();  // read 0th variable.
 
   // The rest of the parameters are the same for the method of the Closure class
   // being invoked and the top-level function (target).
   for (intptr_t i = 1; i < positional_argument_count; i++) {
-    body += LoadLocal(LookupVariable(
-        ReaderOffset() + relative_kernel_offset_));  // ith variable offset.
+    LocalVariable* parameter = LookupParameterDirect(
+        ReaderOffset() + relative_kernel_offset_, parameter_index--);
+    body += LoadLocal(parameter);  // ith variable offset.
     body += PushArgument();
     SkipVariableDeclaration();  // read ith variable.
   }
 
   // Named.
   const intptr_t named_argument_count = ReadListLength();
   Array& argument_names = Array::ZoneHandle(Z);
   if (named_argument_count > 0) {
     argument_names = Array::New(named_argument_count);
     for (intptr_t i = 0; i < named_argument_count; i++) {
@@ skipping 41 matching lines @@
   intptr_t context_size =
       parsed_function()->node_sequence()->scope()->num_context_variables();
   if (context_size > 0) {
     body += flow_graph_builder_->PushContext(context_size);
     LocalVariable* context = MakeTemporary();
 
     // Copy captured parameters from the stack into the context.
     LocalScope* scope = parsed_function()->node_sequence()->scope();
     intptr_t parameter_count = dart_function.NumParameters();
     intptr_t parameter_index = parsed_function()->first_parameter_index();
+
     for (intptr_t i = 0; i < parameter_count; ++i, --parameter_index) {
       LocalVariable* variable = scope->VariableAt(i);
       if (variable->is_captured()) {
         // There is no LocalVariable describing the on-stack parameter so
         // create one directly and use the same type.
         LocalVariable* parameter = new (Z)
             LocalVariable(TokenPosition::kNoSource, TokenPosition::kNoSource,
                           Symbols::TempParam(), variable->type());
         parameter->set_index(parameter_index);
         // Mark the stack variable so it will be ignored by the code for
@@ skipping 745 matching lines @@
       ReadUInt();        // read kernel position.
       ReadUInt();        // read relative variable index.
       SkipExpression();  // read expression.
       return;
     case kSpecializedVariableSet:
       ReadPosition();    // read position.
       ReadUInt();        // read kernel position.
       SkipExpression();  // read expression.
       return;
     case kPropertyGet:
-      ReadPosition();    // read position.
-      SkipExpression();  // read receiver.
-      SkipName();        // read name.
+      ReadPosition();                // read position.
+      SkipExpression();              // read receiver.
+      SkipName();                    // read name.
       SkipCanonicalNameReference();  // read interface_target_reference.
       return;
     case kPropertySet:
-      ReadPosition();    // read position.
-      SkipExpression();  // read receiver.
-      SkipName();        // read name.
-      SkipExpression();  // read value.
+      ReadPosition();                // read position.
+      SkipExpression();              // read receiver.
+      SkipName();                    // read name.
+      SkipExpression();              // read value.
       SkipCanonicalNameReference();  // read interface_target_reference.
       return;
     case kDirectPropertyGet:
       ReadPosition();                // read position.
       SkipExpression();              // read receiver.
       SkipCanonicalNameReference();  // read target_reference.
       return;
     case kDirectPropertySet:
       ReadPosition();                // read position.
       SkipExpression();              // read receiver.
       SkipCanonicalNameReference();  // read target_reference.
       SkipExpression();              // read value·
       return;
     case kStaticGet:
       ReadPosition();                // read position.
       SkipCanonicalNameReference();  // read target_reference.
       return;
     case kStaticSet:
       ReadPosition();                // read position.
       SkipCanonicalNameReference();  // read target_reference.
       SkipExpression();              // read expression.
       return;
     case kMethodInvocation:
-      ReadPosition();    // read position.
-      SkipExpression();  // read receiver.
-      SkipName();        // read name.
-      SkipArguments();   // read arguments.
+      ReadPosition();                // read position.
+      SkipExpression();              // read receiver.
+      SkipName();                    // read name.
+      SkipArguments();               // read arguments.
       SkipCanonicalNameReference();  // read interface_target_reference.
       return;
     case kDirectMethodInvocation:
       SkipExpression();              // read receiver.
       SkipCanonicalNameReference();  // read target_reference.
       SkipArguments();               // read arguments.
       return;
     case kStaticInvocation:
     case kConstStaticInvocation:
       ReadPosition();                // read position.
@@ skipping 813 matching lines @@
   *negate = PeekTag() == kNot;
   if (*negate) {
     SkipBytes(1);  // Skip Not tag, thus go directly to the inner expression.
   }
   Fragment instructions = BuildExpression();  // read expression.
   instructions += CheckBooleanInCheckedMode();
   return instructions;
 }
 
 const TypeArguments& StreamingFlowGraphBuilder::BuildTypeArguments() {
-  ReadUInt();                                // read arguments count.
-  intptr_t type_count = ReadListLength();    // read type count.
-  return T.BuildTypeArguments(type_count);   // read types.
+  ReadUInt();                               // read arguments count.
+  intptr_t type_count = ReadListLength();   // read type count.
+  return T.BuildTypeArguments(type_count);  // read types.
 }
 
 Fragment StreamingFlowGraphBuilder::BuildArguments(Array* argument_names,
                                                    intptr_t* argument_count,
                                                    bool skip_push_arguments,
                                                    bool do_drop) {
   intptr_t dummy;
   if (argument_count == NULL) argument_count = &dummy;
   *argument_count = ReadUInt();  // read arguments count.
 
@@ skipping 18 matching lines @@
     if (do_drop) instructions += Drop();
   }
 
   // List of named.
   list_length = ReadListLength();  // read list length.
   if (argument_names != NULL && list_length > 0) {
     *argument_names ^= Array::New(list_length, Heap::kOld);
   }
   for (intptr_t i = 0; i < list_length; ++i) {
     String& name = H.DartSymbol(ReadStringReference());  // read ith name index.
-    instructions += BuildExpression();        // read ith expression.
+    instructions += BuildExpression();                   // read ith expression.
     if (!skip_push_arguments) instructions += PushArgument();
     if (do_drop) instructions += Drop();
     if (argument_names != NULL) {
       argument_names->SetAt(i, name);
     }
   }
 
   return instructions;
 }
 
@@ skipping 2558 matching lines @@
     }
   }
 
   return Array::Handle(Array::null());
 }
 
 }  // namespace kernel
 }  // namespace dart
 
 #endif  // !defined(DART_PRECOMPILED_RUNTIME)