dart2js cps: Refactor CallExpressions into Primitives.

pkg/compiler/lib/src/cps_ir/scalar_replacement.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.scalar_replacement;
 
 import 'optimizers.dart';
 
 import 'dart:collection' show Queue;
 
 import '../common.dart';
@@ skipping 124 matching lines @@
     // field's value.
     for (Reference ref = allocation.firstRef; ref != null; ref = ref.next) {
       Node use = ref.parent;
       if (use is GetField) {
         GetField getField = use;
         MutableVariable variable = cells[getField.field];
         if (variable != null) {
           GetMutable getter = new GetMutable(variable);
           getter.type = getField.type;
           getter.variable.parent = getter;
-          getter.substituteFor(getField);
+          getField.replaceUsesWith(getter);
           replacePrimitive(getField, getter);
           deletePrimitive(getField);
         } else {
           Primitive value = fieldInitialValues[getField.field];
-          value.substituteFor(getField);
+          getField.replaceUsesWith(value);
           deleteLetPrimOf(getField);
         }
       } else if (use is SetField && use.object == ref) {
         SetField setField = use;
         MutableVariable variable = cells[setField.field];
         Primitive value = setField.value.definition;
         variable.type = variable.type.union(value.type, classWorld);
         SetMutable setter = new SetMutable(variable, value);
         setter.variable.parent = setter;
         setter.value.parent = setter;
-        setter.substituteFor(setField);
+        setField.replaceUsesWith(setter);
         replacePrimitive(setField, setter);
         deletePrimitive(setField);
       } else {
         assert(false);
       }
     }
 
     // Delete [allocation] since that might 'free' another scalar replacement
     // candidate by deleting the last non-field-access.
     deleteLetPrimOf(allocation);
@@ skipping 48 matching lines @@
 class ScalarReplacementRemovalVisitor extends TrampolineRecursiveVisitor {
   ScalarReplacementVisitor process;
 
   ScalarReplacementRemovalVisitor(this.process);
 
   processReference(Reference reference) {
     process.reconsider(reference.definition);
     reference.unlink();
   }
 }