Revert "cps-ir: Add support for intercepted calls."

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';
 
 import '../js_backend.dart';
 import '../../dart2jslib.dart';
 import '../../source_file.dart';
 import '../../cps_ir/cps_ir_nodes.dart' as cps;
 import '../../cps_ir/cps_ir_builder.dart';
 import '../../tree_ir/tree_ir_nodes.dart' as tree_ir;
 import '../../tree/tree.dart' as ast;
-import '../../types/types.dart' show TypeMask, UnionTypeMask, FlatTypeMask,
-    ForwardingTypeMask;
+import '../../types/types.dart' show TypeMask;
 import '../../scanner/scannerlib.dart' as scanner;
 import '../../elements/elements.dart';
 import '../../closure.dart';
 import '../../js/js.dart' as js;
 import '../../source_map_builder.dart';
 import '../../tree_ir/tree_ir_builder.dart' as tree_builder;
 import '../../dart_backend/backend_ast_emitter.dart' as backend_ast_emitter;
 import '../../cps_ir/optimizers.dart';
 import '../../tracer.dart';
 import '../../js_backend/codegen/codegen.dart';
@@ skipping 71 matching lines @@
         element.enclosingClass is ClosureClassElement ||
         element.isNative ||
         element.isField) {
       giveUp('unsupported element kind: ${element.name}:${element.kind}');
     }
 
     cps.FunctionDefinition cpsNode = irBuilderTask.buildNode(element);
     if (cpsNode == null) {
       giveUp('unable to build cps definition of $element');
     }
-    new UnsugarVisitor(glue).rewrite(cpsNode);
+    const UnsugarVisitor().rewrite(cpsNode);
     return cpsNode;
   }
 
   static const Pattern PRINT_TYPED_IR_FILTER = null;
 
-  String formatTypeMask(TypeMask type) {
-    if (type is UnionTypeMask) {
-      return '[${type.disjointMasks.map(formatTypeMask).join(', ')}]';
-    } else if (type is FlatTypeMask) {
-      if (type.isEmpty) {
-        return "null";
-      }
-      String suffix = (type.isExact ? "" : "+") + (type.isNullable ? "?" : "!");
-      return '${type.base.name}$suffix';
-    } else if (type is ForwardingTypeMask) {
-      return formatTypeMask(type.forwardTo);
-    }
-    throw 'unsupported: $type';
-  }
-
   cps.FunctionDefinition optimizeCpsIR(cps.FunctionDefinition cpsNode) {
     // Transformations on the CPS IR.
     traceGraph("IR Builder", cpsNode);
 
     TypePropagator typePropagator = new TypePropagator<TypeMask>(compiler,
         constantSystem, new TypeMaskSystem(compiler), compiler.internalError);
     typePropagator.rewrite(cpsNode);
     traceGraph("Sparse constant propagation", cpsNode);
 
     if (PRINT_TYPED_IR_FILTER != null &&
         PRINT_TYPED_IR_FILTER.matchAsPrefix(cpsNode.element.name) != null) {
       String printType(cps.Node node, String s) {
         var type = typePropagator.getType(node);
-        return type == null ? s : "$s:${formatTypeMask(type.type)}";
+        return type == null ? s : "<$type: $s>";
       }
       DEBUG_MODE = true;
       print(new SExpressionStringifier(printType).visit(cpsNode));
     }
 
     new RedundantPhiEliminator().rewrite(cpsNode);
     traceGraph("Redundant phi elimination", cpsNode);
     new ShrinkingReducer().rewrite(cpsNode);
     traceGraph("Shrinking reductions", cpsNode);
 
     // Do not rewrite the IR after variable allocation.  Allocation
     // makes decisions based on an approximation of IR variable live
     // ranges that can be invalidated by transforming the IR.
     new cps.RegisterAllocator().visit(cpsNode);
     return cpsNode;
   }
 
   tree_ir.FunctionDefinition compileToTreeIR(cps.FunctionDefinition cpsNode) {
-    tree_builder.Builder builder = new tree_builder.Builder(glue, compiler);
+    tree_builder.Builder builder = new tree_builder.Builder(compiler);
     tree_ir.FunctionDefinition treeNode = builder.buildFunction(cpsNode);
     assert(treeNode != null);
     traceGraph('Tree builder', treeNode);
     return treeNode;
   }
 
   tree_ir.FunctionDefinition optimizeTreeIR(
       tree_ir.FunctionDefinition treeNode) {
     // Transformations on the Tree IR.
     new StatementRewriter().rewrite(treeNode);
@@ skipping 49 matching lines @@
           new TokenSourceFileLocation(sourceFile, endToken, name);
     }
     return node.withPosition(sourcePosition, endSourcePosition);
   }
 
   SourceFile sourceFileOfElement(Element element) {
     return element.implementation.compilationUnit.script.file;
   }
 
 }