[cfe] Remove instrumentation

This removes the support for instrumentation from the inferrer and merges the local and top level inferrer, whose only difference was whether instrumentation was enabled or not. The instrumentation system hasn't be updated for a long time and no longer carries its weight.


Change-Id: If999aff8ca302164a60b3c44d8b31595306c7042
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/451261
Reviewed-by: Chloe Stefantsova <[email protected]>
Commit-Queue: Johnni Winther <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/base/instrumentation.dart

@@ -238,12 +238,10 @@ class FactoryEncoding implements InferredTypeListener {
     Member? target = redirectingFactoryTarget.target;
     if (typeArguments != null && typeArguments.any((t) => t is UnknownType)) {
       TypeInferrer inferrer = libraryBuilder.loader.typeInferenceEngine
-          .createLocalTypeInferrer(
-            _fragment.fileUri,
-            declarationBuilder.thisType,
-            libraryBuilder,
-            _fragment.typeParameterScope,
-            null,
+          .createTypeInferrer(
+            thisType: declarationBuilder.thisType,
+            libraryBuilder: libraryBuilder,
+            extensionScope: _fragment.typeParameterScope,
           );
       MemberLookupResult? result = _redirectionTarget.target;
       MemberBuilder? targetBuilder;

pkg/front_end/lib/src/fragment/factory/encoding.dart

@@ -86,7 +86,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: scope,
-      isTopLevel: false,
       fileUri: annotationsFileUri,
     );
     // TODO(johnniwinther): Should this be `ConstantContext.required`?
@@ -154,7 +153,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: scope,
-      isTopLevel: false,
       fileUri: fileUri,
     );
     CompilerContext compilerContext = libraryBuilder.loader.target.context;
@@ -246,7 +244,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: scope,
-      isTopLevel: true,
       fileUri: fileUri,
     );
     ConstantContext constantContext = isConst
@@ -285,7 +282,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: scope,
-      isTopLevel: false,
       fileUri: fileUri,
     );
     ConstantContext constantContext = isConst
@@ -329,7 +325,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: scope,
-      isTopLevel: false,
       fileUri: fileUri,
       inferenceDataForTesting: inferenceDataForTesting,
     );
@@ -386,7 +381,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: formalParameterScope,
-      isTopLevel: false,
       fileUri: fileUri,
       inferenceDataForTesting:
           functionBodyBuildingContext.inferenceDataForTesting,
@@ -452,7 +446,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: typeParameterScope,
-      isTopLevel: false,
       fileUri: fileUri,
     );
 
@@ -520,7 +513,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: typeParameterScope,
-      isTopLevel: false,
       fileUri: fileUri,
     );
     ConstantContext constantContext = isConst
@@ -550,7 +542,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: scope,
-      isTopLevel: false,
       fileUri: fileUri,
     );
     ConstantContext constantContext = bodyBuilderContext.constantContext;
@@ -596,7 +587,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: scope,
-      isTopLevel: false,
       fileUri: fileUri,
     );
     ConstantContext constantContext = ConstantContext.required;
@@ -642,7 +632,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: typeParameterScope,
-      isTopLevel: false,
       fileUri: fileUri,
       inferenceDataForTesting:
           functionBodyBuildingContext.inferenceDataForTesting,
@@ -714,7 +703,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: typeParameterScope,
-      isTopLevel: false,
       fileUri: fileUri,
       inferenceDataForTesting:
           functionBodyBuildingContext.inferenceDataForTesting,
@@ -754,7 +742,6 @@ class Resolver {
       libraryBuilder: libraryBuilder,
       bodyBuilderContext: bodyBuilderContext,
       scope: scope,
-      isTopLevel: false,
       fileUri: fileUri,
     );
 

pkg/front_end/lib/src/kernel/resolver.dart

@@ -82,28 +82,15 @@ class _ResolverContext {
     required SourceLibraryBuilder libraryBuilder,
     required BodyBuilderContext bodyBuilderContext,
     required LookupScope scope,
-    required bool isTopLevel,
     required Uri fileUri,
     InferenceDataForTesting? inferenceDataForTesting,
   }) {
-    TypeInferrer typeInferrer;
-    if (isTopLevel) {
-      typeInferrer = typeInferenceEngine.createTopLevelTypeInferrer(
-        fileUri,
-        bodyBuilderContext.thisType,
-        libraryBuilder,
-        scope,
-        inferenceDataForTesting,
-      );
-    } else {
-      typeInferrer = typeInferenceEngine.createLocalTypeInferrer(
-        fileUri,
-        bodyBuilderContext.thisType,
-        libraryBuilder,
-        scope,
-        inferenceDataForTesting,
-      );
-    }
+    TypeInferrer typeInferrer = typeInferenceEngine.createTypeInferrer(
+      thisType: bodyBuilderContext.thisType,
+      libraryBuilder: libraryBuilder,
+      extensionScope: scope,
+      dataForTesting: inferenceDataForTesting,
+    );
     TypeEnvironment typeEnvironment = typeInferrer.typeSchemaEnvironment;
     AssignedVariables assignedVariables = typeInferrer.assignedVariables;
     return new _ResolverContext._(

pkg/front_end/lib/src/kernel/resolver_helpers.dart

@@ -19,7 +19,6 @@ import 'api_prototype/front_end.dart' show CompilerResult;
 import 'api_prototype/kernel_generator.dart';
 import 'base/compiler_context.dart' show CompilerContext;
 import 'base/crash.dart' show withCrashReporting;
-import 'base/instrumentation.dart';
 import 'base/processed_options.dart' show ProcessedOptions;
 import 'base/uri_offset.dart';
 import 'base/uri_translator.dart' show UriTranslator;
@@ -69,7 +68,6 @@ Future<InternalCompilerResult> generateKernelInternal(
   bool includeHierarchyAndCoreTypes = false,
   bool retainDataForTesting = false,
   Benchmarker? benchmarker,
-  Instrumentation? instrumentation,
   List<Component>? additionalDillsForTesting,
   bool allowVerificationErrorForTesting = false,
 }) async {
@@ -127,7 +125,6 @@ Future<InternalCompilerResult> generateKernelInternal(
         uriTranslator,
       );
       sourceLoader = kernelTarget.loader;
-      sourceLoader!.instrumentation = instrumentation;
       kernelTarget.setEntryPoints(options.inputs);
       await kernelTarget.computeNeededPrecompilations();
       kernelTarget.benchmarker

pkg/front_end/lib/src/kernel_generator_impl.dart

@@ -36,7 +36,6 @@ import '../api_prototype/file_system.dart';
 import '../base/common.dart';
 import '../base/export.dart' show Export;
 import '../base/import_chains.dart';
-import '../base/instrumentation.dart' show Instrumentation;
 import '../base/loader.dart' show Loader, untranslatableUriScheme;
 import '../base/lookup_result.dart';
 import '../base/messages.dart';
@@ -137,8 +136,6 @@ class SourceLoader extends Loader implements ProblemReportingHelper {
 
   TypeInferenceEngineImpl? _typeInferenceEngine;
 
-  Instrumentation? instrumentation;
-
   final SourceLoaderDataForTesting? dataForTesting;
 
   final Map<Uri, CompilationUnit> _compilationUnits = {};
@@ -2876,8 +2873,7 @@ severity: $severity
 
   void createTypeInferenceEngine() {
     _typeInferenceEngine = new TypeInferenceEngineImpl(
-      instrumentation,
-      target.benchmarker,
+      benchmarker: target.benchmarker,
     );
   }
 
@@ -3115,7 +3111,6 @@ severity: $severity
     sourceBytes.clear();
     target.releaseAncillaryResources();
     _coreTypes = null;
-    instrumentation = null;
   }
 
   @override

pkg/front_end/lib/src/source/source_loader.dart

@@ -5,7 +5,6 @@
 import 'package:_fe_analyzer_shared/src/types/shared_type.dart';
 import 'package:kernel/ast.dart';
 
-import '../base/instrumentation.dart' show InstrumentationValueForMember;
 import '../codes/cfe_codes.dart';
 import '../kernel/hierarchy/class_member.dart';
 import '../kernel/internal_ast.dart';
@@ -137,18 +136,6 @@ class PropertyForInVariable implements ForInVariable {
     if (error != null) {
       _rhs = error;
     } else {
-      if (writeTarget.isInstanceMember || writeTarget.isObjectMember) {
-        if (visitor.instrumentation != null &&
-            receiverType == const DynamicType()) {
-          // Coverage-ignore-block(suite): Not run.
-          visitor.instrumentation!.record(
-            visitor.uriForInstrumentation,
-            propertySet.fileOffset,
-            'target',
-            new InstrumentationValueForMember(writeTarget.member!),
-          );
-        }
-      }
       _rhs = propertySet.value;
     }
     return elementType;