Dart2js async-await. Bind the async-body to the current zone.

pkg/compiler/lib/src/js/rewrite_async.dart

 // Copyright (c) 2015, 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 rewrite_async;
 
 import "dart:math" show max;
 import 'dart:collection';
 
 import 'package:_internal/compiler/js_lib/shared/async_await_error_codes.dart'
@@ skipping 1653 matching lines @@
   /// - The error to complete the completer with.
   /// - [error_codes.ERROR]
   /// - The completer object [completer]
   final js.Expression asyncHelper;
 
   /// Contructor used to initialize the [completer] variable.
   ///
   /// Specific to async methods.
   final js.Expression newCompleter;
 
+  final js.Expression wrapBody;
 
   AsyncRewriter(DiagnosticListener diagnosticListener,
                 spannable,
                 {this.asyncHelper,
                  this.newCompleter,
+                 this.wrapBody,
                  String safeVariableName(String proposedName),
                  String bodyName})
         : super(diagnosticListener,
                 spannable,
                 safeVariableName,
                 bodyName);
 
   @override
   void addYield(js.DartYield node, js.Expression expression) {
     diagnosticListener.internalError(spannable,
@@ skipping 60 matching lines @@
             "completer": completer});
   }
 
   @override
   js.Fun finishFunction(List<js.Parameter> parameters,
                         js.Statement rewrittenBody,
                         js.VariableDeclarationList variableDeclarations) {
     return js.js("""
         function (#parameters) {
           #variableDeclarations;
-          function #bodyName(#errorCode, #result) {
+          var #bodyName = #wrapBody(function (#errorCode, #result) {
             if (#errorCode === #ERROR) {
                 #currentError = #result;
                 #goto = #handler;
             }
             #rewrittenBody;
-          }
+          });
           return #asyncHelper(null, #bodyName, #completer, null);
         }""", {
           "parameters": parameters,
           "variableDeclarations": variableDeclarations,
           "ERROR": js.number(error_codes.ERROR),
           "rewrittenBody": rewrittenBody,
           "bodyName": bodyName,
           "currentError": currentError,
           "goto": goto,
           "handler": handler,
           "errorCode": errorCodeName,
           "result": resultName,
           "asyncHelper": asyncHelper,
           "completer": completer,
+          "wrapBody": wrapBody,
         });
   }
 }
 
 class SyncStarRewriter extends AsyncRewriterBase {
 
   bool get isSyncStar => true;
 
   /// Contructor creating the Iterable for a sync* method. Called with
   /// [bodyName].
@@ skipping 174 matching lines @@
   /// A JS Expression that creates a marker indicating a 'yield' statement.
   ///
   /// Called with the value to yield.
   final js.Expression yieldExpression;
 
   /// A JS Expression that creates a marker indication a 'yield*' statement.
   ///
   /// Called with the stream to yield from.
   final js.Expression yieldStarExpression;
 
+  final js.Expression wrapBody;
+
   AsyncStarRewriter(DiagnosticListener diagnosticListener,
                 spannable,
                 {this.asyncStarHelper,
                  this.streamOfController,
                  this.newController,
                  this.yieldExpression,
                  this.yieldStarExpression,
+                 this.wrapBody,
                  String safeVariableName(String proposedName),
                  String bodyName})
         : super(diagnosticListener,
                 spannable,
                 safeVariableName,
                 bodyName);
 
 
   /// Translates a yield/yield* in an async* function.
   ///
@@ skipping 25 matching lines @@
       "controller": controllerName,
     }));
   }
 
   @override
   js.Fun finishFunction(List<js.Parameter> parameters,
                         js.Statement rewrittenBody,
                         js.VariableDeclarationList variableDeclarations) {
     return js.js("""
         function (#parameters) {
-          #variableDeclarations;
-          function #bodyName(#errorCode, #result) {
+          var #bodyName = #wrapBody(function (#errorCode, #result) {
             if (#hasYield) {
               switch (#errorCode) {
                 case #STREAM_WAS_CANCELED:
                   #next = #nextWhenCanceled;
                   #goto = #next.pop();
                   break;
                 case #ERROR:
                   #currentError = #result;
                   #goto = #handler;
               }
             } else {
               if (#errorCode === #ERROR) {
                 #currentError = #result;
                 #goto = #handler;
               }
             }
             #rewrittenBody;
-          }
+          });
+          #variableDeclarations;
           return #streamOfController(#controller);
         }""", {
           "parameters": parameters,
           "variableDeclarations": variableDeclarations,
           "STREAM_WAS_CANCELED": js.number(error_codes.STREAM_WAS_CANCELED),
           "ERROR": js.number(error_codes.ERROR),
           "hasYield": analysis.hasYield,
           "rewrittenBody": rewrittenBody,
           "bodyName": bodyName,
           "currentError": currentError,
           "goto": goto,
           "handler": handler,
           "next": next,
           "nextWhenCanceled": nextWhenCanceled,
           "errorCode": errorCodeName,
           "result": resultName,
           "streamOfController": streamOfController,
           "controller": controllerName,
+          "wrapBody": wrapBody,
         });
   }
 
   @override
   void addErrorExit() {
     beginLabel(rethrowLabel);
     addStatement(js.js.statement(
         "return #asyncHelper(#currentError, #errorCode, #controller);", {
           "asyncHelper": asyncStarHelper,
           "errorCode": js.number(error_codes.ERROR),
@@ skipping 12 matching lines @@
       "streamHelper": asyncStarHelper,
       "successCode": js.number(error_codes.SUCCESS),
       "controller": controllerName}));
   }
 
   @override
   Iterable<js.VariableInitialization> variableInitializations() {
     List<js.VariableInitialization> variables =
         new List<js.VariableInitialization>();
     variables.add(_makeVariableInitializer(controller,
-                         js.js('#(#)', [newController, bodyName])));
+                         js.js('#(#)',
+                               [newController, bodyName])));
     if (analysis.hasYield) {
       variables.add(_makeVariableInitializer(nextWhenCanceled, null));
     }
     return variables;
   }
 
   @override
   void initializeNames() {
     controllerName = freshName("controller");
     nextWhenCanceledName = freshName("nextWhenCanceled");
@@ skipping 435 matching lines @@
     return condition || body;
   }
 
   @override
   bool visitDartYield(js.DartYield node) {
     hasYield = true;
     visit(node.expression);
     return true;
   }
 }