Revert "dart2js: Initial implementation of inlining."

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 48 matching lines @@
   final FunctionCompiler fallbackCompiler;
   TypeMaskSystem typeSystem;
 
   Tracer get tracer => compiler.tracer;
 
   final IrBuilderTask cpsBuilderTask;
   final GenericTask cpsOptimizationTask;
   final GenericTask treeBuilderTask;
   final GenericTask treeOptimizationTask;
 
-  Inliner inliner;
-
   CpsFunctionCompiler(Compiler compiler, JavaScriptBackend backend,
                       SourceInformationStrategy sourceInformationFactory)
       : fallbackCompiler =
             new ssa.SsaFunctionCompiler(backend, sourceInformationFactory),
         cpsBuilderTask = new IrBuilderTask(compiler, sourceInformationFactory),
-        sourceInformationFactory = sourceInformationFactory,
+        this.sourceInformationFactory = sourceInformationFactory,
         constantSystem = backend.constantSystem,
         compiler = compiler,
         glue = new Glue(compiler),
         cpsOptimizationTask = new GenericTask('CPS optimization', compiler),
         treeBuilderTask = new GenericTask('Tree builder', compiler),
-      treeOptimizationTask = new GenericTask('Tree optimization', compiler) {
-    inliner = new Inliner(this);
-  }
+        treeOptimizationTask = new GenericTask('Tree optimization', compiler);
 
   String get name => 'CPS Ir pipeline';
 
   JavaScriptBackend get backend => compiler.backend;
 
   DiagnosticReporter get reporter => compiler.reporter;
 
   /// Generates JavaScript code for `work.element`.
   js.Fun compile(CodegenWorkItem work) {
-    if (typeSystem == null) typeSystem = new TypeMaskSystem(compiler);
     AstElement element = work.element;
     return reporter.withCurrentElement(element, () {
+      typeSystem = new TypeMaskSystem(compiler);
       try {
         // TODO(karlklose): remove this fallback when we do not need it for
         // testing anymore.
         if (false) {
           reporter.log('Using SSA compiler for platform element $element');
           return fallbackCompiler.compile(work);
         }
 
         if (tracer != null) {
           tracer.traceCompilation(element.name, null);
         }
         cps.FunctionDefinition cpsFunction = compileToCpsIr(element);
-        optimizeCpsBeforeInlining(cpsFunction);
-        applyCpsPass(inliner, cpsFunction);
-        optimizeCpsAfterInlining(cpsFunction);
+        cpsFunction = optimizeCpsIr(cpsFunction);
         cpsIntegrityChecker = null;
         tree_ir.FunctionDefinition treeFunction = compileToTreeIr(cpsFunction);
         treeFunction = optimizeTreeIr(treeFunction);
         return compileToJavaScript(work, treeFunction);
       } on CodegenBailout catch (e) {
         String message = "Unable to compile $element with the new compiler.\n"
             "  Reason: ${e.message}";
         reporter.internalError(element, message);
       }
     });
@@ skipping 77 matching lines @@
   bool checkCpsIntegrity(cps.FunctionDefinition node, String previousPass) {
     cpsOptimizationTask.measureSubtask('Check integrity', () {
       if (cpsIntegrityChecker == null) {
         cpsIntegrityChecker = new CheckCpsIntegrity();
       }
       cpsIntegrityChecker.check(node, previousPass);
     });
     return true; // So this can be used from assert().
   }
 
-  void optimizeCpsBeforeInlining(cps.FunctionDefinition cpsFunction) {
+  cps.FunctionDefinition optimizeCpsIr(cps.FunctionDefinition cpsFunction) {
     cpsOptimizationTask.measure(() {
       applyCpsPass(new RedundantJoinEliminator(), cpsFunction);
       applyCpsPass(new RedundantPhiEliminator(), cpsFunction);
       applyCpsPass(new InsertRefinements(typeSystem), cpsFunction);
-      applyCpsPass(new TypePropagator(this), cpsFunction);
+      applyCpsPass(new TypePropagator(compiler, typeSystem, this), cpsFunction);
       applyCpsPass(new RedundantJoinEliminator(), cpsFunction);
       applyCpsPass(new ShrinkingReducer(), cpsFunction);
-    });
-  }
-
-  void optimizeCpsAfterInlining(cps.FunctionDefinition cpsFunction) {
-    cpsOptimizationTask.measure(() {
       applyCpsPass(new RedundantRefinementEliminator(typeSystem), cpsFunction);
       applyCpsPass(new EagerlyLoadStatics(), cpsFunction);
       applyCpsPass(new GVN(compiler, typeSystem), cpsFunction);
       applyCpsPass(new UpdateRefinements(typeSystem), cpsFunction);
       applyCpsPass(new BoundsChecker(typeSystem, compiler.world), cpsFunction);
       applyCpsPass(new ShrinkingReducer(), cpsFunction);
       applyCpsPass(new ScalarReplacer(compiler), cpsFunction);
       applyCpsPass(new MutableVariableEliminator(), cpsFunction);
       applyCpsPass(new RedundantJoinEliminator(), cpsFunction);
       applyCpsPass(new RedundantPhiEliminator(), cpsFunction);
       applyCpsPass(new ShrinkingReducer(), cpsFunction);
       applyCpsPass(new OptimizeInterceptors(backend), cpsFunction);
       applyCpsPass(new BackwardNullCheckRemover(typeSystem), cpsFunction);
       applyCpsPass(new ShrinkingReducer(), cpsFunction);
     });
+    return cpsFunction;
   }
 
   tree_ir.FunctionDefinition compileToTreeIr(cps.FunctionDefinition cpsNode) {
     applyCpsPass(new Finalize(backend), cpsNode);
     tree_builder.Builder builder = new tree_builder.Builder(
         reporter.internalError);
     tree_ir.FunctionDefinition treeNode =
         treeBuilderTask.measure(() => builder.buildFunction(cpsNode));
     assert(treeNode != null);
     traceGraph('Tree builder', treeNode);
@@ skipping 48 matching lines @@
         treeOptimizationTask]
       ..addAll(fallbackCompiler.tasks);
   }
 
   js.Node attachPosition(js.Node node, AstElement element) {
     return node.withSourceInformation(
         sourceInformationFactory.createBuilderForContext(element)
             .buildDeclaration(element));
   }
 }