Use entities in various ssa helpers.

pkg/compiler/lib/src/ssa/interceptor_simplifier.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.
 
 import '../common/backend_api.dart' show BackendClasses;
 import '../compiler.dart' show Compiler;
 import '../constants/constant_system.dart';
 import '../constants/values.dart';
-import '../elements/elements.dart';
+import '../elements/entities.dart';
 import '../js_backend/backend.dart';
 import '../types/types.dart';
 import '../universe/selector.dart' show Selector;
 import '../world.dart' show ClosedWorld;
 import 'nodes.dart';
 import 'optimize.dart';
 
 /**
  * This phase simplifies interceptors in multiple ways:
  *
@@ skipping 12 matching lines @@
  *
  * 5) Some HIs operations on an interceptor are replaced with a HIs version that
  * uses 'instanceof' rather than testing a type flag.
  *
  */
 class SsaSimplifyInterceptors extends HBaseVisitor
     implements OptimizationPhase {
   final String name = "SsaSimplifyInterceptors";
   final ClosedWorld closedWorld;
   final Compiler compiler;
-  final Element element;
+  final ClassEntity enclosingClass;
   HGraph graph;
 
-  SsaSimplifyInterceptors(this.compiler, this.closedWorld, this.element);
+  SsaSimplifyInterceptors(this.compiler, this.closedWorld, this.enclosingClass);
 
   JavaScriptBackend get backend => compiler.backend;
 
   BackendClasses get backendClasses => closedWorld.backendClasses;
 
   ConstantSystem get constantSystem => closedWorld.constantSystem;
 
   void visitGraph(HGraph graph) {
     this.graph = graph;
     visitDominatorTree(graph);
@@ skipping 32 matching lines @@
 
     HInstruction constant = tryComputeConstantInterceptor(
         invoke.inputs[1], interceptor.interceptedClasses);
     if (constant != null) {
       invoke.changeUse(interceptor, constant);
     }
     return false;
   }
 
   bool canUseSelfForInterceptor(
-      HInstruction receiver, Set<ClassElement> interceptedClasses) {
+      HInstruction receiver, Set<ClassEntity> interceptedClasses) {
     if (receiver.canBePrimitive(closedWorld)) {
       // Primitives always need interceptors.
       return false;
     }
     if (receiver.canBeNull() &&
         interceptedClasses.contains(backendClasses.nullImplementation)) {
       // Need the JSNull interceptor.
       return false;
     }
 
     // All intercepted classes extend `Interceptor`, so if the receiver can't be
     // a class extending `Interceptor` then it can be called directly.
     return new TypeMask.nonNullSubclass(
             backend.helpers.jsInterceptorClass, closedWorld)
         .isDisjoint(receiver.instructionType, closedWorld);
   }
 
   HInstruction tryComputeConstantInterceptor(
-      HInstruction input, Set<ClassElement> interceptedClasses) {
+      HInstruction input, Set<ClassEntity> interceptedClasses) {
     if (input == graph.explicitReceiverParameter) {
       // If `explicitReceiverParameter` is set it means the current method is an
       // interceptor method, and `this` is the interceptor.  The caller just did
       // `getInterceptor(foo).currentMethod(foo)` to enter the current method.
       return graph.thisInstruction;
     }
 
-    ClassElement constantInterceptor = tryComputeConstantInterceptorFromType(
+    ClassEntity constantInterceptor = tryComputeConstantInterceptorFromType(
         input.instructionType, interceptedClasses);
 
     if (constantInterceptor == null) return null;
 
     // If we just happen to be in an instance method of the constant
     // interceptor, `this` is a shorter alias.
-    if (constantInterceptor == element.enclosingClass &&
+    if (constantInterceptor == enclosingClass &&
         graph.thisInstruction != null) {
       return graph.thisInstruction;
     }
 
     ConstantValue constant = new InterceptorConstantValue(constantInterceptor);
     return graph.addConstant(constant, closedWorld);
   }
 
-  ClassElement tryComputeConstantInterceptorFromType(
-      TypeMask type, Set<ClassElement> interceptedClasses) {
+  ClassEntity tryComputeConstantInterceptorFromType(
+      TypeMask type, Set<ClassEntity> interceptedClasses) {
     if (type.isNullable) {
       if (type.isNull) {
         return backendClasses.nullImplementation;
       }
     } else if (type.containsOnlyInt(closedWorld)) {
       return backendClasses.intImplementation;
     } else if (type.containsOnlyDouble(closedWorld)) {
       return backendClasses.doubleImplementation;
     } else if (type.containsOnlyBool(closedWorld)) {
       return backendClasses.boolImplementation;
@@ skipping 13 matching lines @@
       // is constrained to a leaf native class, we can use the class's
       // interceptor directly.
 
       // TODO(sra): Key DOM classes like Node, Element and Event are not leaf
       // classes.  When the receiver type is not a leaf class, we might still be
       // able to use the receiver class as a constant interceptor.  It is
       // usually the case that methods defined on a non-leaf class don't test
       // for a subclass or call methods defined on a subclass.  Provided the
       // code is completely insensitive to the specific instance subclasses, we
       // can use the non-leaf class directly.
-      ClassElement element = type.singleClass(closedWorld);
+      ClassEntity element = type.singleClass(closedWorld);
       if (element != null && backendClasses.isNativeClass(element)) {
         return element;
       }
     }
 
     return null;
   }
 
   HInstruction findDominator(Iterable<HInstruction> instructions) {
     HInstruction result;
@@ skipping 22 matching lines @@
     //     (a) => a.length + a.hashCode
     //
     // Currently we use the most general interceptor since all intercepted types
     // implement `hashCode`. But in this example, `a.hashCode` is only reached
     // if `a.length` succeeds, which is indicated by the hashCode receiver being
     // a HTypeKnown instruction.
 
     int useCount(HInstruction user, HInstruction used) =>
         user.inputs.where((input) => input == used).length;
 
-    Set<ClassElement> interceptedClasses;
+    Set<ClassEntity> interceptedClasses;
     HInstruction dominator = findDominator(node.usedBy);
     // If there is a call that dominates all other uses, we can use just the
     // selector of that instruction.
     if (dominator is HInvokeDynamic &&
         dominator.isCallOnInterceptor(closedWorld) &&
         node == dominator.receiver &&
         useCount(dominator, node) == 1) {
       interceptedClasses =
           backend.getInterceptedClassesOn(dominator.selector.name);
 
       // If we found that we need number, we must still go through all
       // uses to check if they require int, or double.
       if (interceptedClasses.contains(backendClasses.numImplementation) &&
           !(interceptedClasses.contains(backendClasses.doubleImplementation) ||
               interceptedClasses.contains(backendClasses.intImplementation))) {
-        Set<ClassElement> required;
+        Set<ClassEntity> required;
         for (HInstruction user in node.usedBy) {
           if (user is! HInvoke) continue;
-          Set<ClassElement> intercepted =
+          Set<ClassEntity> intercepted =
               backend.getInterceptedClassesOn(user.selector.name);
           if (intercepted.contains(backendClasses.intImplementation)) {
-            required ??= new Set<ClassElement>();
+            // TODO(johnniwinther): Use type argument when all uses of intercepted

[Siggi Cherem (dart-lang), 2017/01/11 23:58:51]

nit: 80 col here and below

[Johnni Winther, 2017/01/12 12:01:48]

Done.

+            // classes expect entities instead of elements.
+            required ??= new Set/*<ClassEntity>*/();
             required.add(backendClasses.intImplementation);
           }
           if (intercepted.contains(backendClasses.doubleImplementation)) {
-            required ??= new Set<ClassElement>();
+            // TODO(johnniwinther): Use type argument when all uses of intercepted
+            // classes expect entities instead of elements.
+            required ??= new Set/*<ClassEntity>*/();
             required.add(backendClasses.doubleImplementation);
           }
         }
         // Don't modify the result of [backend.getInterceptedClassesOn].
         if (required != null) {
           interceptedClasses = interceptedClasses.union(required);
         }
       }
     } else {
-      interceptedClasses = new Set<ClassElement>();
+      // TODO(johnniwinther): Use type argument when all uses of intercepted
+      // classes expect entities instead of elements.
+      interceptedClasses = new Set/*<ClassEntity>*/();
       for (HInstruction user in node.usedBy) {
         if (user is HInvokeDynamic &&
             user.isCallOnInterceptor(closedWorld) &&
             node == user.receiver &&
             useCount(user, node) == 1) {
           interceptedClasses
               .addAll(backend.getInterceptedClassesOn(user.selector.name));
         } else if (user is HInvokeSuper &&
             user.isCallOnInterceptor(closedWorld) &&
             node == user.receiver &&
@@ skipping 41 matching lines @@
     // `null` but not any other JavaScript falsy value, `null` values cause
     // `NoSuchMethodError`s, and if the receiver was not null we would have a
     // constant interceptor `C`.  Then we can use `(receiver && C)` for the
     // interceptor.
     if (receiver.canBeNull()) {
       if (!interceptedClasses.contains(backendClasses.nullImplementation)) {
         // Can use `(receiver && C)` only if receiver is either null or truthy.
         if (!(receiver.canBePrimitiveNumber(closedWorld) ||
             receiver.canBePrimitiveBoolean(closedWorld) ||
             receiver.canBePrimitiveString(closedWorld))) {
-          ClassElement interceptorClass = tryComputeConstantInterceptorFromType(
+          ClassEntity interceptorClass = tryComputeConstantInterceptorFromType(
               receiver.instructionType.nonNullable(), interceptedClasses);
           if (interceptorClass != null) {
             HInstruction constantInstruction = graph.addConstant(
                 new InterceptorConstantValue(interceptorClass), closedWorld);
             node.conditionalConstantInterceptor = constantInstruction;
             constantInstruction.usedBy.add(node);
             return false;
           }
         }
       }
@@ skipping 89 matching lines @@
       instruction = new HInvokeDynamicMethod(
           selector, mask, inputs, node.instructionType, true);
     }
 
     HBasicBlock block = node.block;
     block.addAfter(node, instruction);
     block.rewrite(node, instruction);
     return true;
   }
 }