dart2js cps: Use TypeMaskSystem when inserting refinement nodes.

pkg/compiler/lib/src/js_backend/codegen/task.dart

 // Copyright (c) 2014, 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.
 
 /// Generate code using the cps-based IR pipeline.
 library code_generator_task;
 
 import 'glue.dart';
 import 'codegen.dart';
 import 'unsugar.dart';
@@ skipping 20 matching lines @@
 import '../../tree_ir/tree_ir_builder.dart' as tree_builder;
 import '../../cps_ir/optimizers.dart';
 import '../../cps_ir/optimizers.dart' as cps_opt;
 import '../../tracer.dart';
 import '../../js_backend/codegen/codegen.dart';
 import '../../ssa/ssa.dart' as ssa;
 import '../../tree_ir/optimization/optimization.dart';
 import '../../tree_ir/optimization/optimization.dart' as tree_opt;
 import '../../tree_ir/tree_ir_integrity.dart';
 import '../../cps_ir/cps_ir_nodes_sexpr.dart';
+import '../../cps_ir/type_mask_system.dart';
 
 class CpsFunctionCompiler implements FunctionCompiler {
   final ConstantSystem constantSystem;
   // TODO(karlklose): remove the compiler.
   final Compiler compiler;
   final Glue glue;
   final SourceInformationStrategy sourceInformationFactory;
 
   // TODO(karlklose,sigurdm): remove and update dart-doc of [compile].
   final FunctionCompiler fallbackCompiler;
@@ skipping 11 matching lines @@
         compiler = compiler,
         glue = new Glue(compiler);
 
   String get name => 'CPS Ir pipeline';
 
   JavaScriptBackend get backend => compiler.backend;
 
   /// Generates JavaScript code for `work.element`.
   js.Fun compile(CodegenWorkItem work) {
     AstElement element = work.element;
-    JavaScriptBackend backend = compiler.backend;
     return compiler.withCurrentElement(element, () {
       try {
         // TODO(karlklose): remove this fallback when we do not need it for
         // testing anymore.
         if (false) {
           compiler.log('Using SSA compiler for platform element $element');
           return fallbackCompiler.compile(work);
         }
 
         if (tracer != null) {
@@ skipping 80 matching lines @@
   }
 
   cps.FunctionDefinition optimizeCpsIR(cps.FunctionDefinition cpsNode) {
     // Transformations on the CPS IR.
     void applyCpsPass(cps_opt.Pass pass) {
       pass.rewrite(cpsNode);
       traceGraph(pass.passName, cpsNode);
       assert(checkCpsIntegrity(cpsNode));
     }
 
+    TypeMaskSystem typeSystem = new TypeMaskSystem(compiler);
+
     applyCpsPass(new RedundantJoinEliminator());
     applyCpsPass(new RedundantPhiEliminator());
-    applyCpsPass(new InsertRefinements(compiler.typesTask, compiler.world));
-    TypePropagator typePropagator = new TypePropagator(compiler, this);
+    applyCpsPass(new InsertRefinements(typeSystem));
+    TypePropagator typePropagator =
+        new TypePropagator(compiler, typeSystem, this);
     applyCpsPass(typePropagator);
     dumpTypedIR(cpsNode, typePropagator);
     applyCpsPass(new RemoveRefinements());
     applyCpsPass(new ShrinkingReducer());
     applyCpsPass(new ScalarReplacer(compiler));
     applyCpsPass(new MutableVariableEliminator());
     applyCpsPass(new RedundantJoinEliminator());
     applyCpsPass(new RedundantPhiEliminator());
     applyCpsPass(new ShrinkingReducer());
     applyCpsPass(new LoopInvariantCodeMotion());
@@ skipping 50 matching lines @@
     // TODO(sigurdm): Make a better list of tasks.
     return <CompilerTask>[irBuilderTask]..addAll(fallbackCompiler.tasks);
   }
 
   js.Node attachPosition(js.Node node, AstElement element) {
     return node.withSourceInformation(
         sourceInformationFactory.createBuilderForContext(element)
             .buildDeclaration(element));
   }
 }