Use elements/types in constants/values

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

Index: pkg/compiler/lib/src/ssa/interceptor_simplifier.dart
diff --git a/pkg/compiler/lib/src/ssa/interceptor_simplifier.dart b/pkg/compiler/lib/src/ssa/interceptor_simplifier.dart
index e015e67a63fc1a78e6ed827dbcbaa0e452aa2961..beb5b9e6c2626920eef18d9512cac589a1045d31 100644
--- a/pkg/compiler/lib/src/ssa/interceptor_simplifier.dart
+++ b/pkg/compiler/lib/src/ssa/interceptor_simplifier.dart
@@ -134,8 +134,7 @@ class SsaSimplifyInterceptors extends HBaseVisitor
       return graph.thisInstruction;
     }
 
-    ConstantValue constant =
-        new InterceptorConstantValue(constantInterceptor.thisType);
+    ConstantValue constant = new InterceptorConstantValue(constantInterceptor);
     return graph.addConstant(constant, closedWorld);
   }
 
@@ -319,8 +318,7 @@ class SsaSimplifyInterceptors extends HBaseVisitor
               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;