Clean up instrumentation of invocation targets.

pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart

 // Copyright (c) 2017, 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.
 
 /// This file declares a "shadow hierarchy" of concrete classes which extend
 /// the kernel class hierarchy, adding methods and fields needed by the
 /// BodyBuilder.
 ///
 /// Instances of these classes may be created using the factory methods in
 /// `ast_factory.dart`.
@@ skipping 1054 matching lines @@
     bool isOverloadedArithmeticOperator = false;
     Member interfaceMember;
     if (receiverType is InterfaceType) {
       interfaceMember = inferrer.classHierarchy
           .getInterfaceMember(receiverType.classNode, name);
       if (interfaceMember is Procedure) {
         // Our non-strong golden files currently don't include interface
         // targets, so we can't store the interface target without causing tests
         // to fail.  TODO(paulberry): fix this.
         if (inferrer.strongMode) {
+          inferrer.instrumentation?.record(Uri.parse(inferrer.uri), fileOffset,
+              'target', new InstrumentationValueForProcedure(interfaceMember));
           interfaceTarget = interfaceMember;
         }
         isOverloadedArithmeticOperator = inferrer.typeSchemaEnvironment
             .isOverloadedArithmeticOperator(interfaceMember);
       }
     }
-    var calleeType = inferrer.getCalleeFunctionType(
-        interfaceMember, receiverType, name, fileOffset);
+    var calleeType =
+        inferrer.getCalleeFunctionType(interfaceMember, receiverType, name);
     var inferredType = inferrer.inferInvocation(typeContext, typeNeeded,
         fileOffset, calleeType, calleeType.returnType, arguments,
         isOverloadedArithmeticOperator: isOverloadedArithmeticOperator,
         receiverType: receiverType);
     inferrer.listener.methodInvocationExit(this, inferredType);
     return inferredType;
   }
 }
 
 /// Shadow object for [Not].
@@ skipping 781 matching lines @@
           closureContext.isAsync
               ? inferrer.coreTypes.streamClass
               : inferrer.coreTypes.iterableClass);
     }
     var inferredType = inferrer.inferExpression(
         expression, typeContext, closureContext != null);
     closureContext.handleYield(inferrer, isYieldStar, inferredType);
     inferrer.listener.yieldStatementExit(this);
   }
 }