Remove _ClassEnsurer

This is no longer needed since we eagerly register all classes with the
ClassHierarchyBuilder

Change-Id: Ifaa27017bac6a7b0a659de83af415f2bd25ea005
Reviewed-on: https://dart-review.googlesource.com/75260
Reviewed-by: Stephen Adams <[email protected]>

Author: johnniwinther

pkg/compiler/lib/src/ssa/kernel_impact.dart

@@ -48,14 +48,11 @@ class KernelImpactBuilder extends ir.Visitor {
   final DiagnosticReporter reporter;
   final CompilerOptions _options;
   final MemberEntity currentMember;
-  _ClassEnsurer classEnsurer;
 
   KernelImpactBuilder(
       this.elementMap, this.currentMember, this.reporter, this._options)
       : this.impactBuilder =
-            new ResolutionWorldImpactBuilder('${currentMember}') {
-    this.classEnsurer = new _ClassEnsurer(this, this.elementMap.types);
-  }
+            new ResolutionWorldImpactBuilder('${currentMember}');
 
   CommonElements get commonElements => elementMap.commonElements;
 
@@ -79,23 +76,16 @@ class KernelImpactBuilder extends ir.Visitor {
     return type;
   }
 
-  void registerSeenClasses(ir.DartType irType) {
-    DartType type = elementMap.getDartType(irType);
-    classEnsurer.ensureClassesInType(type);
-  }
-
   /// Add checked-mode type use for the parameter type and constant for the
   /// default value of [parameter].
   void handleParameter(ir.VariableDeclaration parameter) {
     checkType(parameter.type, TypeUseKind.PARAMETER_CHECK);
-    registerSeenClasses(parameter.type);
     visitNode(parameter.initializer);
   }
 
   /// Add checked-mode type use for parameter and return types, and add
   /// constants for default values.
   void handleSignature(ir.FunctionNode node) {
-    registerSeenClasses(node.returnType);
     node.positionalParameters.forEach(handleParameter);
     node.namedParameters.forEach(handleParameter);
     for (ir.TypeParameter parameter in node.typeParameters) {
@@ -105,7 +95,6 @@ class KernelImpactBuilder extends ir.Visitor {
 
   ResolutionImpact buildField(ir.Field field) {
     checkType(field.type, TypeUseKind.PARAMETER_CHECK);
-    registerSeenClasses(field.type);
     if (field.initializer != null) {
       visitNode(field.initializer);
       if (!field.isInstanceMember &&
@@ -261,7 +250,6 @@ class KernelImpactBuilder extends ir.Visitor {
   void visitListLiteral(ir.ListLiteral literal) {
     visitNodes(literal.expressions);
     DartType elementType = elementMap.getDartType(literal.typeArgument);
-    registerSeenClasses(literal.typeArgument);
 
     impactBuilder.registerListLiteral(new ListLiteralUse(
         commonElements.listType(elementType),
@@ -274,8 +262,6 @@ class KernelImpactBuilder extends ir.Visitor {
     visitNodes(literal.entries);
     DartType keyType = elementMap.getDartType(literal.keyType);
     DartType valueType = elementMap.getDartType(literal.valueType);
-    registerSeenClasses(literal.keyType);
-    registerSeenClasses(literal.valueType);
     impactBuilder.registerMapLiteral(new MapLiteralUse(
         commonElements.mapType(keyType, valueType),
         isConstant: literal.isConst,
@@ -326,7 +312,6 @@ class KernelImpactBuilder extends ir.Visitor {
 
     InterfaceType type = elementMap.createInterfaceType(
         target.enclosingClass, node.arguments.types);
-    classEnsurer.ensureClassesInType(type);
     CallStructure callStructure = elementMap.getCallStructure(node.arguments);
     impactBuilder.registerStaticUse(isConst
         ? new StaticUse.constConstructorInvoke(constructor, callStructure, type)
@@ -456,7 +441,6 @@ class KernelImpactBuilder extends ir.Visitor {
   @override
   void visitStaticGet(ir.StaticGet node) {
     ir.Member target = node.target;
-    registerSeenClasses(target.getterType);
     if (target is ir.Procedure && target.kind == ir.ProcedureKind.Method) {
       FunctionEntity method = elementMap.getMethod(target);
       impactBuilder.registerStaticUse(new StaticUse.staticTearOff(method));
@@ -470,7 +454,6 @@ class KernelImpactBuilder extends ir.Visitor {
   void visitStaticSet(ir.StaticSet node) {
     visitNode(node.value);
     MemberEntity member = elementMap.getMember(node.target);
-    registerSeenClasses(node.target.setterType);
     impactBuilder.registerStaticUse(new StaticUse.staticSet(member));
   }
 
@@ -739,7 +722,6 @@ class KernelImpactBuilder extends ir.Visitor {
 
   @override
   void visitVariableDeclaration(ir.VariableDeclaration node) {
-    registerSeenClasses(node.type);
     if (node.initializer != null) {
       visitNode(node.initializer);
     } else {
@@ -751,7 +733,6 @@ class KernelImpactBuilder extends ir.Visitor {
   void visitIsExpression(ir.IsExpression node) {
     impactBuilder.registerTypeUse(
         new TypeUse.isCheck(elementMap.getDartType(node.type)));
-    registerSeenClasses(node.type);
     visitNode(node.operand);
   }
 
@@ -763,7 +744,6 @@ class KernelImpactBuilder extends ir.Visitor {
     } else {
       impactBuilder.registerTypeUse(new TypeUse.asCast(type));
     }
-    registerSeenClasses(node.type);
     visitNode(node.operand);
   }
 
@@ -856,53 +836,3 @@ class KernelImpactBuilder extends ir.Visitor {
   @override
   void defaultNode(ir.Node node) => node.visitChildren(this);
 }
-
-class _ClassEnsurer extends BaseDartTypeVisitor<dynamic, Null> {
-  final KernelImpactBuilder builder;
-  final DartTypes types;
-  final seenTypes = new Set<InterfaceType>();
-
-  _ClassEnsurer(this.builder, this.types);
-
-  void ensureClassesInType(DartType type) {
-    seenTypes.clear();
-    type.accept(this, null);
-  }
-
-  @override
-  visitType(DartType type, _) {}
-
-  @override
-  visitFunctionType(FunctionType type, _) {
-    type.returnType.accept(this, null);
-    type.parameterTypes.forEach((t) {
-      t.accept(this, null);
-    });
-    type.optionalParameterTypes.forEach((t) {
-      t.accept(this, null);
-    });
-    type.namedParameterTypes.forEach((t) {
-      t.accept(this, null);
-    });
-  }
-
-  @override
-  visitInterfaceType(InterfaceType type, _) {
-    if (!seenTypes.add(type)) {
-      return;
-    }
-    builder.impactBuilder.registerSeenClass(type.element);
-    type.typeArguments.forEach((t) {
-      t.accept(this, null);
-    });
-    var supertype = types.getSupertype(type.element);
-    supertype?.accept(this, null);
-  }
-
-  @override
-  visitTypedefType(TypedefType type, _) {
-    type.typeArguments.forEach((t) {
-      t.accept(this, null);
-    });
-  }
-}