dart2js cps: Refactor CallExpressions into Primitives.

pkg/compiler/lib/src/cps_ir/redundant_phi.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.
 
 library dart2js.cps_ir.redundant_phi_elimination;
 
 import 'cps_ir_nodes.dart';
 import 'optimizers.dart';
 
 /// Eliminate redundant phis from the given [FunctionDefinition].
@@ skipping 120 matching lines @@
             workSet.add(thatCont);
           }
         }
       }
 
       // Replace individual parameters:
       // * In the continuation body, replace occurrence of param with value,
       // * and implicitly remove param from continuation signature and
       //   invocations by not incrementing `dst`. References of removed
       //   arguments are unlinked to keep definition usages up to date.
-      uniqueDefinition.substituteFor(oldDefinition);
+      oldDefinition.replaceUsesWith(uniqueDefinition);
       for (InvokeContinuation invoke in invokes) {
         invoke.arguments[src].unlink();
       }
 
       // Finally, if the substituted definition is not in scope of the affected
       // continuation, move the continuation binding. This is safe to do since
       // the continuation is referenced only as the target in continuation
       // invokes, and all such invokes must be within the scope of
       // [uniqueDefinition]. Note that this is linear in the depth of
       // the binding of [uniqueDefinition].
@@ skipping 32 matching lines @@
 void _moveIntoScopeOf(LetCont letCont, Definition definition) {
   if (_isInScopeOf(letCont, definition)) return;
 
   InteriorNode binding = definition.parent;
   letCont.remove();
   letCont.insertBelow(binding);
 }
 
 /// Ensures [continuation] has its own LetCont binding by creating
 /// a new LetCont below its current binding, if necessary.
-/// 
+///
 /// Returns the LetCont that now binds [continuation].
 LetCont _makeUniqueBinding(Continuation continuation) {
   LetCont letCont = continuation.parent;
   if (letCont.continuations.length == 1) return letCont;
   letCont.continuations.remove(continuation);
   LetCont newBinding = new LetCont(continuation, null);
   continuation.parent = newBinding;
   newBinding.insertBelow(letCont);
   return newBinding;
 }