Revert "Proper sequencing of _asyncStackTraceHelper in Kernel"

pkg/kernel/lib/transformations/continuation.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.continuation;
 
 import 'dart:math' as math;
 
 import '../ast.dart';
 import '../core_types.dart';
@@ skipping 197 matching lines @@
     // sync* functions cannot return a value.
     assert(node.expression == null || node.expression is NullLiteral);
     node.expression = new BoolLiteral(false)..parent = node;
     return node;
   }
 }
 
 abstract class AsyncRewriterBase extends ContinuationRewriterBase {
   final VariableDeclaration nestedClosureVariable =
       new VariableDeclaration(":async_op");
-  final VariableDeclaration stackTraceVariable =
-      new VariableDeclaration(":async_stack_trace");
   final VariableDeclaration thenContinuationVariable =
       new VariableDeclaration(":async_op_then");
   final VariableDeclaration catchErrorContinuationVariable =
       new VariableDeclaration(":async_op_error");
 
   LabeledStatement labeledBody;
 
   ExpressionLifter expressionRewriter;
 
   AsyncRewriterBase(helper, enclosingFunction)
       : super(helper, enclosingFunction) {}
 
   void setupAsyncContinuations(List<Statement> statements) {
     expressionRewriter = new ExpressionLifter(this);
 
-    // var :async_stack_trace;
-    statements.add(stackTraceVariable);
-
     // var :async_op_then;
     statements.add(thenContinuationVariable);
 
     // var :async_op_error;
     statements.add(catchErrorContinuationVariable);
 
     // :async_op([:result, :exception, :stack_trace]) {
     //     modified <node.body>;
     // }
     final parameters = <VariableDeclaration>[
@@ skipping 19 matching lines @@
     // these.
     statements.addAll(variableDeclarations());
     statements.addAll(expressionRewriter.variables);
 
     // Now add the closure function itself.
     final closureFunction =
         new FunctionDeclaration(nestedClosureVariable, function)
           ..fileOffset = enclosingFunction.parent.fileOffset;
     statements.add(closureFunction);
 
-    // :async_stack_trace = _asyncStackTraceHelper(asyncBody);
-    final stackTrace = new StaticInvocation(helper.asyncStackTraceHelper,
-        new Arguments(<Expression>[new VariableGet(nestedClosureVariable)]));
-    final stackTraceAssign = new ExpressionStatement(
-        new VariableSet(stackTraceVariable, stackTrace));
-    statements.add(stackTraceAssign);
-
     // :async_op_then = _asyncThenWrapperHelper(asyncBody);
     final boundThenClosure = new StaticInvocation(helper.asyncThenWrapper,
         new Arguments(<Expression>[new VariableGet(nestedClosureVariable)]));
     final thenClosureVariableAssign = new ExpressionStatement(
         new VariableSet(thenContinuationVariable, boundThenClosure));
     statements.add(thenClosureVariableAssign);
 
     // :async_op_error = _asyncErrorWrapperHelper(asyncBody);
     final boundCatchErrorClosure = new StaticInvocation(
         helper.asyncErrorWrapper,
@@ skipping 616 matching lines @@
   final Class iteratorClass;
   final Class futureClass;
   final Class futureOrClass;
   final Class completerClass;
   final Procedure printProcedure;
   final Procedure completerConstructor;
   final Procedure futureMicrotaskConstructor;
   final Constructor streamControllerConstructor;
   final Constructor syncIterableConstructor;
   final Constructor streamIteratorConstructor;
-  final Procedure asyncStackTraceHelper;
   final Procedure asyncThenWrapper;
   final Procedure asyncErrorWrapper;
   final Procedure awaitHelper;
   final CoreTypes coreTypes;
 
   HelperNodes(
       this.asyncLibrary,
       this.coreLibrary,
       this.iteratorClass,
       this.futureClass,
       this.futureOrClass,
       this.completerClass,
       this.printProcedure,
       this.completerConstructor,
       this.syncIterableConstructor,
       this.streamIteratorConstructor,
       this.futureMicrotaskConstructor,
       this.streamControllerConstructor,
-      this.asyncStackTraceHelper,
       this.asyncThenWrapper,
       this.asyncErrorWrapper,
       this.awaitHelper,
       this.coreTypes);
 
   factory HelperNodes.fromCoreTypes(CoreTypes coreTypes) {
     return new HelperNodes(
         coreTypes.asyncLibrary,
         coreTypes.coreLibrary,
         coreTypes.iteratorClass,
         coreTypes.futureClass,
         coreTypes.futureOrClass,
         coreTypes.completerClass,
         coreTypes.printProcedure,
         coreTypes.completerSyncConstructor,
         coreTypes.syncIterableDefaultConstructor,
         coreTypes.streamIteratorDefaultConstructor,
         coreTypes.futureMicrotaskConstructor,
         coreTypes.asyncStarStreamControllerDefaultConstructor,
-        coreTypes.asyncStackTraceHelperProcedure,
         coreTypes.asyncThenWrapperHelperProcedure,
         coreTypes.asyncErrorWrapperHelperProcedure,
         coreTypes.awaitHelperProcedure,
         coreTypes);
   }
 }