Fix several bugs in closure conversion.

pkg/kernel/lib/transformations/closure/converter.dart

 // 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.
 
 library kernel.transformations.closure.converter;
 
 import '../../ast.dart'
     show
+        AsyncMarker,
         Arguments,
         Block,
         Catch,
         Class,
         ClosureCreation,
         Constructor,
         DartType,
         EmptyStatement,
         Expression,
         ExpressionStatement,
@@ skipping 320 matching lines @@
 
   TreeNode visitField(Field node) {
     currentMember = node;
     context = new NoContext(this);
     node = super.visitField(node);
     context = null;
     currentMember = null;
     return node;
   }
 
-  Expression handleLocalFunction(FunctionNode function) {
+  Expression handleLocalFunction(FunctionNode function, [bool nope]) {

[Dmitry Stefantsov, 2017/08/24 09:41:13]

Is [nope] used anywhere?  If not, I suggest removing it.  If it is used, I
suggest considering renaming it into something more descriptive, turning it into
a named parameter (to me, it's hard to guess the meaning of boolean parameters
at call sights otherwise), and giving it the default value `false` (so that we
may remove the first line assigning `false` to [nope] in case it wasn't
specified).

[sjindel, 2017/08/24 11:11:43]

This was just some vestigial debugging code.

+    nope ??= false;
+    if (function.asyncMarker != AsyncMarker.Sync || nope) {
+      function.transformChildren(this);
+      return new FunctionExpression(function);
+    }
     FunctionNode enclosingFunction = currentFunction;
     Map<TypeParameter, DartType> enclosingTypeSubstitution = typeSubstitution;
     currentFunction = function;
     Statement body = function.body;
     assert(body != null);
 
     rewriter = makeRewriterForBody(function);
 
     VariableDeclaration contextVariable =
         new VariableDeclaration("#contextParameter", type: const VectorType());
@@ skipping 187 matching lines @@
         .forEach(extendContextConditionally(inInitializer: false));
     assert(node.body != null);
     node.body = node.body.accept(this);
     node.body.parent = node;
     return node;
   }
 
   TreeNode visitBlock(Block node) {
     return saveContext(() {
       BlockRewriter blockRewriter = rewriter = rewriter.forNestedBlock(node);
+      if (node.parent is Statement &&
+          (node.parent as Statement).isLoop &&
+          context is! NoContext) {
+        context = context.toNestedContext();
+      }
       blockRewriter.transformStatements(this);
       return node;
     });
   }
 
   TreeNode visitVariableDeclaration(VariableDeclaration node) {
     node.transformChildren(this);
 
     if (!capturedVariables.contains(node)) return node;
     if (node.initializer == null && node.parent is FunctionNode) {
@@ skipping 253 matching lines @@
     copy.function.body.parent = copy.function;
     return copy;
   }
 
   void addGetterForwarder(Name name, Procedure getter) {
     assert(getter.isGetter);
     newClassMembers
         .add(copyWithBody(getter, forwardToThisProperty(getter))..name = name);
   }
 }