Revert "Allow LetCont to bind multiple continuations."

pkg/compiler/lib/src/cps_ir/shrinking_reductions.dart

 // Copyright (c) 2014, 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.
 
 part of dart2js.cps_ir.optimizers;
 
 /**
  * [ShrinkingReducer] applies shrinking reductions to CPS terms as described
  * in 'Compiling with Continuations, Continued' by Andrew Kennedy.
  */
@@ skipping 28 matching lines @@
   void _removeNode(InteriorNode node) {
     Node body           = node.body;
     InteriorNode parent = node.parent;
     assert(parent.body == node);
 
     body.parent = parent;
     parent.body = body;
     node.parent = _DELETED;
   }
 
-  /// Remove a given continuation from the CPS graph.  The LetCont itself is
-  /// removed if the given continuation is the only binding.
-  void _removeContinuation(Continuation cont) {
-    LetCont parent = cont.parent;
-    if (parent.continuations.length == 1) {
-      assert(cont.parent_index == 0);
-      _removeNode(parent);
-    } else {
-      List<Continuation> continuations = parent.continuations;
-      for (int i = cont.parent_index; i < continuations.length - 1; ++i) {
-        Continuation current = continuations[i + 1];
-        continuations[i] = current;
-        current.parent_index = i;
-      }
-      continuations.removeLast();
-    }
-    cont.parent = _DELETED;
-  }
-
   void _processTask(_ReductionTask task) {
-    // Skip tasks for deleted nodes.
+    // Lazily skip tasks for deleted nodes.
     if (task.node.parent == _DELETED) {
       return;
     }
 
     switch (task.kind) {
       case _ReductionKind.DEAD_VAL:
         _reduceDeadVal(task);
         break;
       case _ReductionKind.DEAD_CONT:
         _reduceDeadCont(task);
@@ skipping 21 matching lines @@
     // Perform bookkeeping on removed body and scan for new redexes.
     new _RemovalRedexVisitor(_worklist).visit(letPrim.primitive);
   }
 
   /// Applies the dead-cont reduction:
   ///   letcont k x = E0 in E1 -> E1 (k not free in E1).
   void _reduceDeadCont(_ReductionTask task) {
     assert(_isDeadCont(task.node));
 
     // Remove dead continuation.
-    Continuation cont = task.node;
-    _removeContinuation(cont);
+    LetCont letCont = task.node;
+    _removeNode(letCont);
 
     // Perform bookkeeping on removed body and scan for new redexes.
-    new _RemovalRedexVisitor(_worklist).visit(cont);
+    new _RemovalRedexVisitor(_worklist).visit(letCont.continuation);
   }
 
   /// Applies the beta-cont-lin reduction:
   ///   letcont k x = E0 in E1[k y] -> E1[E0[y/x]] (k not free in E1).
   void _reduceBetaContLin(_ReductionTask task) {
     // Might have been mutated, recheck if reduction is still valid.
     // In the following example, the beta-cont-lin reduction of k0 could have
     // been invalidated by removal of the dead continuation k1:
     //
     //  letcont k0 x0 = E0 in
     //    letcont k1 x1 = k0 x1 in
     //      return x2
     if (!_isBetaContLin(task.node)) {
       return;
     }
 
     // Remove the continuation.
-    Continuation cont = task.node;
-    _removeContinuation(cont);
+    LetCont letCont = task.node;
+    Continuation cont = letCont.continuation;
+    _removeNode(letCont);
 
     // Replace its invocation with the continuation body.
     InvokeContinuation invoke = cont.firstRef.parent;
     InteriorNode invokeParent = invoke.parent;
 
     cont.body.parent = invokeParent;
     invokeParent.body = cont.body;
 
     // Substitute the invocation argument for the continuation parameter.
     for (int i = 0; i < invoke.arguments.length; i++) {
       Reference argRef = invoke.arguments[i];
       argRef.definition.substituteFor(cont.parameters[i]);
     }
 
-    // Perform bookkeeping on substituted body and scan for new redexes.
+    // Perform bookkeeping on removed body and scan for new redexes.
     new _RemovalRedexVisitor(_worklist).visit(invoke);
   }
 
   /// Applies the eta-cont reduction:
   ///   letcont k x = j x in E -> E[j/k].
   /// If k is unused, degenerates to dead-cont.
   void _reduceEtaCont(_ReductionTask task) {
     // Might have been mutated, recheck if reduction is still valid.
     // In the following example, the eta-cont reduction of k1 could have been
     // invalidated by an earlier beta-cont-lin reduction of k0.
     //
     //  letcont k0 x0 = E0 in
     //    letcont k1 x1 = k0 x1 in E1
     if (!_isEtaCont(task.node)) {
       return;
     }
 
     // Remove the continuation.
-    Continuation cont = task.node;
-    _removeContinuation(cont);
+    LetCont letCont   = task.node;
+    Continuation cont = letCont.continuation;
+    _removeNode(letCont);
 
     InvokeContinuation invoke = cont.body;
     Continuation wrappedCont = invoke.continuation.definition;
 
     // Replace all occurrences with the wrapped continuation.
     wrappedCont.substituteFor(cont);
 
     // Perform bookkeeping on removed body and scan for new redexes.
     new _RemovalRedexVisitor(_worklist).visit(cont);
   }
 }
 
 /// Returns true iff the bound primitive is unused.
 bool _isDeadVal(LetPrim node) => !node.primitive.hasAtLeastOneUse;
 
-/// Returns true iff the continuation is unused.
-bool _isDeadCont(Continuation cont) {
-  return !cont.hasAtLeastOneUse && !cont.isReturnContinuation;
-}
+/// Returns true iff the bound continuation is unused.
+bool _isDeadCont(LetCont node) => !node.continuation.hasAtLeastOneUse;
 
-/// Returns true iff the continuation is used exactly once, and that
-/// use is as the continuation of a continuation invocation.
-bool _isBetaContLin(Continuation cont) {
+/// Returns true iff the bound continuation is used exactly once, and that
+/// use is as the receiver of a continuation invocation.
+bool _isBetaContLin(LetCont node) {
+  Continuation cont = node.continuation;
   if (!cont.hasExactlyOneUse) {
     return false;
   }
 
   if (cont.firstRef.parent is InvokeContinuation) {
     InvokeContinuation invoke = cont.firstRef.parent;
     return (cont == invoke.continuation.definition);
   }
 
   return false;
+
 }
 
-/// Returns true iff the continuation consists of a continuation
+/// Returns true iff the bound continuation consists of a continuation
 /// invocation, passing on all parameters. Special cases exist (see below).
-bool _isEtaCont(Continuation cont) {
-  if (cont.body is! InvokeContinuation) {
+bool _isEtaCont(LetCont node) {
+  Continuation cont = node.continuation;
+  if (!(cont.body is InvokeContinuation)) {
     return false;
   }
 
   InvokeContinuation invoke = cont.body;
   Continuation invokedCont = invoke.continuation.definition;
 
   // Do not eta-reduce return join-points since the resulting code is worse
   // in the common case (i.e. returns are moved inside `if` branches).
   if (invokedCont.isReturnContinuation) {
     return false;
@@ skipping 32 matching lines @@
     if (node.parent == ShrinkingReducer._DELETED) {
       return;
     } else if (_isDeadVal(node)) {
       worklist.add(new _ReductionTask(_ReductionKind.DEAD_VAL, node));
     }
   }
 
   void processLetCont(LetCont node) {
     if (node.parent == ShrinkingReducer._DELETED) {
       return;
-    }
-    for (int i = 0; i < node.continuations.length; ++i) {
-      Continuation cont = node.continuations[i];
-      if (_isDeadCont(cont)) {
-        worklist.add(new _ReductionTask(_ReductionKind.DEAD_CONT, cont));
-      } else if (_isEtaCont(cont)) {
-        worklist.add(new _ReductionTask(_ReductionKind.ETA_CONT, cont));
-      } else if (_isBetaContLin(cont)){
-        worklist.add(new _ReductionTask(_ReductionKind.BETA_CONT_LIN, cont));
-      }
+    } else if (_isDeadCont(node)) {
+      worklist.add(new _ReductionTask(_ReductionKind.DEAD_CONT, node));
+    } else if (_isEtaCont(node)) {
+      worklist.add(new _ReductionTask(_ReductionKind.ETA_CONT, node));
+    } else if (_isBetaContLin(node)){
+      worklist.add(new _ReductionTask(_ReductionKind.BETA_CONT_LIN, node));
     }
   }
 }
 
 /// Traverses a deleted CPS term, marking existing tasks associated with a node
 /// within the term as deleted (which causes them to be skipped lazily when
 /// popped from the worklist), and adding newly created redexes to the worklist.
 class _RemovalRedexVisitor extends _RedexVisitor {
   _RemovalRedexVisitor(Set<_ReductionTask> worklist) : super(worklist);
 
   void processLetPrim(LetPrim node) {
     node.parent = ShrinkingReducer._DELETED;
   }
 
   void processLetCont(LetCont node) {
     node.parent = ShrinkingReducer._DELETED;
   }
 
-  void processContinuation(Continuation node) {
-    node.parent = ShrinkingReducer._DELETED;
-  }
-
   void processReference(Reference reference) {
     reference.unlink();
 
     if (reference.definition is Primitive) {
       Primitive primitive = reference.definition;
       Node parent = primitive.parent;
       if (parent is LetPrim && _isDeadVal(parent)) {
         worklist.add(new _ReductionTask(_ReductionKind.DEAD_VAL, parent));
       }
     } else if (reference.definition is Continuation) {
       Continuation cont = reference.definition;
       if (cont.isRecursive && cont.hasAtMostOneUse) {
         // Convert recursive to nonrecursive continuations.
         // If the continuation is still in use, it is either dead and will be
         // removed, or it is called nonrecursively outside its body.
         cont.isRecursive = false;
       }
-      if (_isDeadCont(cont)) {
-        worklist.add(new _ReductionTask(_ReductionKind.DEAD_CONT, cont));
+      Node parent = cont.parent;
+      if (parent is LetCont && _isDeadCont(parent)) {
+        worklist.add(new _ReductionTask(_ReductionKind.DEAD_CONT, parent));
       }
     }
   }
 }
 
 /// Traverses the CPS term and sets node.parent for each visited node.
 class ParentVisitor extends RecursiveVisitor {
+
   processFunctionDefinition(FunctionDefinition node) {
     node.body.parent = node;
     node.parameters.forEach((Definition p) => p.parent = node);
   }
 
   processRunnableBody(RunnableBody node) {
     node.body.parent = node;
   }
 
   processConstructorDefinition(ConstructorDefinition node) {
@@ skipping 12 matching lines @@
     node.arguments.forEach(
         (RunnableBody argument) => argument.body.parent = node);
   }
 
   processLetPrim(LetPrim node) {
     node.primitive.parent = node;
     node.body.parent = node;
   }
 
   processLetCont(LetCont node) {
-    for (int i = 0; i < node.continuations.length; ++i) {
-      Continuation cont = node.continuations[i];
-      cont.parent = node;
-      cont.parent_index = i;
-    }
+    node.continuation.parent = node;
     node.body.parent = node;
   }
 
   processInvokeStatic(InvokeStatic node) {
+    node.continuation.parent = node;
     node.arguments.forEach((Reference ref) => ref.parent = node);
-    node.continuation.parent = node;
   }
 
   processInvokeContinuation(InvokeContinuation node) {
     node.continuation.parent = node;
     node.arguments.forEach((Reference ref) => ref.parent = node);
   }
 
   processInvokeMethod(InvokeMethod node) {
     node.receiver.parent = node;
     node.continuation.parent = node;
@@ skipping 130 matching lines @@
   }
 
   String toString() => "$kind: $node";
 }
 
 /// A dummy class used solely to mark nodes as deleted once they are removed
 /// from a term.
 class _DeletedNode extends Node {
   accept(_) => null;
 }