cps-ir: Replace getter-invocation methods in IR builder.

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

 // Copyright (c) 2013, 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.ir_builder_task;
 
 import '../closure.dart' as closurelib;
 import '../closure.dart' hide ClosureScope;
 import '../constants/expressions.dart';
 import '../dart_types.dart';
@@ skipping 1039 matching lines @@
         translateDynamicArguments(arguments, callStructure));
   }
 
   @override
   ir.Primitive handleStaticFieldInvoke(
       ast.Send node,
       FieldElement field,
       ast.NodeList arguments,
       CallStructure callStructure,
       _) {
-    return irBuilder.buildStaticFieldInvocation(field, callStructure,
+    ir.Primitive target = irBuilder.buildStaticFieldGet(field);
+    return irBuilder.buildCallInvocation(target,
+        callStructure,
         translateDynamicArguments(arguments, callStructure));
   }
 
   @override
   ir.Primitive handleStaticFunctionInvoke(
       ast.Send node,
       MethodElement function,
       ast.NodeList arguments,
       CallStructure callStructure,
       _) {
     // TODO(karlklose): support foreign functions.
     if (function.isForeign(compiler.backend)) {
       return giveup(node, 'handleStaticFunctionInvoke: foreign: $function');
     }
     return irBuilder.buildStaticFunctionInvocation(function, callStructure,
         translateStaticArguments(arguments, function, callStructure),
         sourceInformation: sourceInformationBuilder.buildCall(node));
   }
 
   @override
   ir.Primitive handleStaticGetterInvoke(
       ast.Send node,
       FunctionElement getter,
       ast.NodeList arguments,
       CallStructure callStructure,
       _) {
-    return irBuilder.buildStaticGetterInvocation(getter, callStructure,
+    ir.Primitive target = irBuilder.buildStaticGetterGet(getter);
+    return irBuilder.buildCallInvocation(target,
+        callStructure,
         translateDynamicArguments(arguments, callStructure));
   }
 
   @override
   ir.Primitive visitSuperFieldInvoke(
       ast.Send node,
       FieldElement field,
       ast.NodeList arguments,
       CallStructure callStructure,
       _) {
-    return irBuilder.buildSuperFieldInvocation(field, callStructure,
+    ir.Primitive target = irBuilder.buildSuperFieldGet(field);
+    return irBuilder.buildCallInvocation(target,
+        callStructure,
         translateDynamicArguments(arguments, callStructure));
   }
 
   @override
   ir.Primitive visitSuperGetterInvoke(
       ast.Send node,
       FunctionElement getter,
       ast.NodeList arguments,
       CallStructure callStructure,
       _) {
-    return irBuilder.buildSuperGetterInvocation(getter, callStructure,
+    ir.Primitive target = irBuilder.buildSuperGetterGet(getter);
+    return irBuilder.buildCallInvocation(target,
+        callStructure,
         translateDynamicArguments(arguments, callStructure));
   }
 
   @override
   ir.Primitive visitSuperMethodInvoke(
       ast.Send node,
       MethodElement method,
       ast.NodeList arguments,
       CallStructure callStructure,
       _) {
@@ skipping 1637 matching lines @@
   SourceInformation buildCall(ast.Node node) {
     return new PositionSourceInformation(
         new TokenSourceLocation(sourceFile, node.getBeginToken(), name));
   }
 
   @override
   SourceInformationBuilder forContext(AstElement element) {
     return new PositionSourceInformationBuilder(element);
   }
 }