Fix bug in dart2js async rewrite

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 862 matching lines @@
   }
 
   @override
   void visitComment(js.Comment node) {
     addStatement(node);
   }
 
   @override
   js.Expression visitConditional(js.Conditional node) {
     if (!shouldTransform(node.then) && !shouldTransform(node.otherwise)) {
-      return withExpression(node.condition, (js.Expression condition) {
-        return js.js('# ? # : #', [condition, node.then, node.otherwise]);
-      }, store: false);
+      return js.js('# ? # : #', [visitExpression(node.condition),
+                                 visitExpression(node.then),
+                                 visitExpression(node.otherwise)]);
     }
     int thenLabel = newLabel("then");
     int joinLabel = newLabel("join");
     int elseLabel = newLabel("else");
     withExpression(node.condition, (js.Expression condition) {
       addStatement(js.js.statement('# = # ? # : #;',
           [goto, condition, js.number(thenLabel), js.number(elseLabel)]));
     }, store: false);
     addBreak();
     beginLabel(thenLabel);
@@ skipping 66 matching lines @@
   }
 
   @override
   void visitDefault(js.Default node) => unreachable(node);
 
   @override
   void visitDo(js.Do node) {
     if (!shouldTransform(node)) {
       bool oldInsideUntranslatedBreakable = insideUntranslatedBreakable;
       insideUntranslatedBreakable = true;
-      withExpression(node.condition, (js.Expression condition) {
-        addStatement(js.js.statement('do {#} while (#)',
-                                     [node.body, condition]));
-      }, store: false);
+      addStatement(js.js.statement('do {#} while (#)',
+                                   [translateInBlock(node.body),
+                                    visitExpression(node.condition)]));
       insideUntranslatedBreakable = oldInsideUntranslatedBreakable;
       return;
     }
     int startLabel = newLabel("do body");
 
     int continueLabel = newLabel("do condition");
     continueLabels[node] = continueLabel;
 
     int afterLabel = newLabel("after do");
     breakLabels[node] = afterLabel;
@@ skipping 355 matching lines @@
       } else {
         addGoto(labels[defaultIndex]);
       }
     } else {
       bool hasDefault = false;
       int i = 0;
       List<js.SwitchClause> clauses = new List<js.SwitchClause>();
       for (js.SwitchClause clause in node.cases) {
         if (clause is js.Case) {
           labels[i] = newLabel("case");
-          clauses.add(new js.Case(clause.expression, gotoAndBreak(labels[i])));
+          clauses.add(new js.Case(visitExpression(clause.expression),
+                                  gotoAndBreak(labels[i])));
         } else if (clause is js.Default) {
           labels[i] = newLabel("default");
           clauses.add(new js.Default(gotoAndBreak(labels[i])));
           hasDefault = true;
         } else {
           diagnosticListener.internalError(
               spannable, "Unknown clause type $clause");
         }
         i++;
       }
@@ skipping 1180 matching lines @@
     return condition || body;
   }
 
   @override
   bool visitDartYield(js.DartYield node) {
     hasYield = true;
     visit(node.expression);
     return true;
   }
 }