Access ConstantSystem through ClosedWorld.

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 20 matching lines @@
  * receiver of an intercepted call a candidate for being generated at use site.
  *
  * 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 ConstantSystem constantSystem;
   final Compiler compiler;
   final Element element;
   HGraph graph;
 
-  SsaSimplifyInterceptors(
-      this.compiler, this.closedWorld, this.constantSystem, this.element);
+  SsaSimplifyInterceptors(this.compiler, this.closedWorld, this.element);
 
   JavaScriptBackend get backend => compiler.backend;
 
   BackendClasses get backendClasses => closedWorld.backendClasses;
 
+  ConstantSystem get constantSystem => closedWorld.constantSystem;
+
   void visitGraph(HGraph graph) {
     this.graph = graph;
     visitDominatorTree(graph);
   }
 
   void visitBasicBlock(HBasicBlock node) {
     currentBlock = node;
 
     HInstruction instruction = node.first;
     while (instruction != null) {
@@ skipping 66 matching lines @@
 
     // 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);
-    return graph.addConstant(constant, compiler);
+    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)) {
       return backendClasses.intImplementation;
@@ skipping 163 matching lines @@
       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),
-                compiler);
+                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 19 matching lines @@
           HInstruction instanceofCheck = new HIs.instanceOf(
               user.typeExpression, user.expression, user.instructionType);
           instanceofCheck.sourceInformation = user.sourceInformation;
           instanceofCheck.sourceElement = user.sourceElement;
           return replaceUserWith(instanceofCheck);
         }
       }
     } else if (user is HInvokeDynamic) {
       if (node == user.inputs[0]) {
         // Replace the user with a [HOneShotInterceptor].
-        HConstant nullConstant = graph.addConstantNull(compiler);
+        HConstant nullConstant = graph.addConstantNull(closedWorld);
         List<HInstruction> inputs = new List<HInstruction>.from(user.inputs);
         inputs[0] = nullConstant;
         HOneShotInterceptor oneShotInterceptor = new HOneShotInterceptor(
             user.selector,
             user.mask,
             inputs,
             user.instructionType,
             interceptedClasses);
         oneShotInterceptor.sourceInformation = user.sourceInformation;
         oneShotInterceptor.sourceElement = user.sourceElement;
@@ skipping 45 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;
   }
 }