Use elements/types in constants/values

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 '../js_backend/backend.dart';
@@ skipping 116 matching lines @@
 
     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 &&
         graph.thisInstruction != null) {
       return graph.thisInstruction;
     }
 
-    ConstantValue constant =
-        new InterceptorConstantValue(constantInterceptor.thisType);
+    ConstantValue constant = new InterceptorConstantValue(constantInterceptor);
     return graph.addConstant(constant, closedWorld);
   }
 
   ClassElement tryComputeConstantInterceptorFromType(
       TypeMask type, Set<ClassElement> interceptedClasses) {
     if (type.isNullable) {
       if (type.isNull) {
         return backendClasses.nullImplementation;
       }
     } else if (type.containsOnlyInt(closedWorld)) {
@@ skipping 163 matching lines @@
     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(
               receiver.instructionType.nonNullable(), interceptedClasses);
           if (interceptorClass != null) {
             HInstruction constantInstruction = graph.addConstant(
-                new InterceptorConstantValue(interceptorClass.thisType),
-                closedWorld);
+                new InterceptorConstantValue(interceptorClass), closedWorld);
             node.conditionalConstantInterceptor = constantInstruction;
             constantInstruction.usedBy.add(node);
             return false;
           }
         }
       }
     }
 
     // Try creating a one-shot interceptor or optimized is-check
     if (compiler.options.hasIncrementalSupport) return false;
@@ skipping 85 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;
   }
 }