dart2js cps: Remove dart2dart from cps pipeline and clean up.

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 135 matching lines @@
             ? nodeOrRef.definition
             : nodeOrRef;
         var type = typePropagator.getType(node);
         return type == null ? s : "$s:${formatTypeMask(type.type)}";
       }
       DEBUG_MODE = true;
       print(new SExpressionStringifier(printType).visit(cpsNode));
     }
   }
 
-  static bool checkCpsIntegrity(cps.RootNode node) {
+  static bool checkCpsIntegrity(cps.FunctionDefinition node) {
     new CheckCpsIntegrity().check(node);
     return true; // So this can be used from assert().
   }
 
   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));
@@ skipping 15 matching lines @@
   tree_ir.FunctionDefinition compileToTreeIR(cps.FunctionDefinition cpsNode) {
     tree_builder.Builder builder = new JsTreeBuilder(
         compiler.internalError, compiler.identicalFunction, glue);
     tree_ir.FunctionDefinition treeNode = builder.buildFunction(cpsNode);
     assert(treeNode != null);
     traceGraph('Tree builder', treeNode);
     assert(checkTreeIntegrity(treeNode));
     return treeNode;
   }
 
-  static bool checkTreeIntegrity(tree_ir.RootNode node) {
+  static bool checkTreeIntegrity(tree_ir.FunctionDefinition node) {
     new CheckTreeIntegrity().check(node);
     return true; // So this can be used from assert().
   }
 
   tree_ir.FunctionDefinition optimizeTreeIR(tree_ir.FunctionDefinition node) {
     void applyTreePass(tree_opt.Pass pass) {
       pass.rewrite(node);
       traceGraph(pass.passName, node);
       assert(checkTreeIntegrity(node));
     }
@@ skipping 17 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.forContext(element)
             .buildDeclaration(element));
   }
 }