dart2js cps: Refactor CallExpressions into Primitives.

pkg/compiler/lib/src/cps_ir/bounds_checker.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 dart2js.cps_ir.bounds_checker;
 
 import 'cps_ir_nodes.dart';
 import 'optimizers.dart' show Pass;
 import 'octagon.dart';
 import '../constants/values.dart';
@@ skipping 380 matching lines @@
     Continuation cont = node.continuation.definition;
     if (isStrongLoopPass) {
       for (int i = 0; i < node.arguments.length; ++i) {
         Parameter param = cont.parameters[i];
         if (!isInt(param)) continue;
         Primitive initialValue = node.arguments[i].definition;
         SignedVariable initialVariable = getValue(initialValue);
         Monotonicity mono = monotonicity[param];
         if (mono == null) {
           // Value never changes. This is extremely uncommon.
-          initialValue.substituteFor(param);
+          param.replaceUsesWith(initialValue);
         } else if (mono == Monotonicity.Increasing) {
           makeGreaterThanOrEqual(getValue(param), initialVariable);
         } else if (mono == Monotonicity.Decreasing) {
           makeLessThanOrEqual(getValue(param), initialVariable);
         }
       }
     }
     if (loopEffects.loopChangesLength(cont)) {
       currentEffectNumber = effectNumberAt[cont] = makeNewEffect();
     }
@@ skipping 49 matching lines @@
       int effect = effectNumberAt[cont];
       if (effect == null) {
         effectNumberAt[cont] = currentEffectNumber;
       } else if (effect != currentEffectNumber && effect != NEW_EFFECT) {
         effectNumberAt[cont] = NEW_EFFECT;
       }
       // TODO(asgerf): Compute join for parameters to increase precision?
     }
   }
 
-  // ---------------- CALL EXPRESSIONS --------------------
+  // ---------------- PRIMITIVES --------------------
 
   @override
   void visitInvokeMethod(InvokeMethod node) {
     // TODO(asgerf): What we really need is a "changes length" side effect flag.
     if (world
         .getSideEffectsOfSelector(node.selector, node.mask)
         .changesIndex()) {
       currentEffectNumber = makeNewEffect();
     }
-    push(node.continuation.definition);
   }
 
   @override
   void visitInvokeStatic(InvokeStatic node) {
     if (world.getSideEffectsOfElement(node.target).changesIndex()) {
       currentEffectNumber = makeNewEffect();
     }
-    push(node.continuation.definition);
   }
 
   @override
   void visitInvokeMethodDirectly(InvokeMethodDirectly node) {
     FunctionElement target = node.target;
     if (target is ConstructorBodyElement) {
       ConstructorBodyElement body = target;
       target = body.constructor;
     }
     if (world.getSideEffectsOfElement(target).changesIndex()) {
       currentEffectNumber = makeNewEffect();
     }
-    push(node.continuation.definition);
   }
 
   @override
   void visitInvokeConstructor(InvokeConstructor node) {
     if (world.getSideEffectsOfElement(node.target).changesIndex()) {
       currentEffectNumber = makeNewEffect();
     }
-    push(node.continuation.definition);
   }
 
   @override
   void visitTypeCast(TypeCast node) {
-    push(node.continuation.definition);
   }
 
   @override
   void visitGetLazyStatic(GetLazyStatic node) {
     // TODO(asgerf): How do we get the side effects of a lazy field initializer?
     currentEffectNumber = makeNewEffect();
-    push(node.continuation.definition);
   }
 
   @override
   void visitForeignCode(ForeignCode node) {
     if (node.nativeBehavior.sideEffects.changesIndex()) {
       currentEffectNumber = makeNewEffect();
     }
-    push(node.continuation.definition);
   }
 
   @override
   void visitAwait(Await node) {
     currentEffectNumber = makeNewEffect();
-    push(node.continuation.definition);
   }
 
   @override
   void visitYield(Yield node) {
     currentEffectNumber = makeNewEffect();
-    push(node.continuation.definition);
   }
 
-  // ---------------- PRIMITIVES --------------------
-
   @override
   void visitApplyBuiltinMethod(ApplyBuiltinMethod node) {
     Primitive receiver = node.receiver.definition;
     int effectBefore = currentEffectNumber;
     currentEffectNumber = makeNewEffect();
     int effectAfter = currentEffectNumber;
     SignedVariable lengthBefore = getLength(receiver, effectBefore);
     SignedVariable lengthAfter = getLength(receiver, effectAfter);
     switch (node.method) {
       case BuiltinMethod.Push:
@@ skipping 43 matching lines @@
     }
     return node.body;
   }
 }
 
 /// Lattice representing the known (weak) monotonicity of a loop variable.
 ///
 /// The lattice bottom is represented by `null` and represents the case where
 /// the loop variable never changes value during the loop.
 enum Monotonicity { NotMonotone, Increasing, Decreasing, }