Fix analyzer2dart end2end.

pkg/compiler/lib/src/dart_backend/backend.dart

 // Copyright (c) 2012, 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.
 
 part of dart_backend;
 
 // TODO(ahe): This class is simply wrong.  This backend should use
 // elements when it can, not AST nodes.  Perhaps a [Map<Element,
 // TreeElements>] is what is needed.
 class ElementAst {
@@ skipping 113 matching lines @@
     world.registerInvocation(new Selector.call("toString", null, 0));
     world.registerInvokedGetter(new Selector.getter("hashCode", null));
     world.registerInvocation(new Selector.binaryOperator("=="));
     world.registerInvocation(new Selector.call("compareTo", null, 1));
   }
 
   void codegen(CodegenWorkItem work) { }
 
   /// Create an [ElementAst] from the CPS IR.
   static ElementAst createElementAst(
-       Compiler compiler,
-       Tracer tracer,
-       ConstantSystem constantSystem,
+       ElementAstCreationContext context,
        Element element,
        cps_ir.ExecutableDefinition cpsDefinition) {
     // Transformations on the CPS IR.
-    if (tracer != null) {
-      tracer.traceCompilation(element.name, null);
-    }
-
-    void traceGraph(String title, var irObject) {
-      if (tracer != null) {
-        tracer.traceGraph(title, irObject);
-      }
-    }
+    context.traceCompilation(element.name);
 
     // TODO(karlklose): enable type propagation for dart2dart when constant
     // types are correctly marked as instantiated (Issue 21880).
-    new TypePropagator(compiler.types, constantSystem, new UnitTypeSystem(),
-        compiler.internalError).rewrite(cpsDefinition);
-    traceGraph("Sparse constant propagation", cpsDefinition);
+    new TypePropagator(context.dartTypes,
+                       context.constantSystem,
+                       new UnitTypeSystem(),
+                       context.internalError)
+        .rewrite(cpsDefinition);
+    context.traceGraph("Sparse constant propagation", cpsDefinition);
     new RedundantPhiEliminator().rewrite(cpsDefinition);
-    traceGraph("Redundant phi elimination", cpsDefinition);
+    context.traceGraph("Redundant phi elimination", cpsDefinition);
     new ShrinkingReducer().rewrite(cpsDefinition);
-    traceGraph("Shrinking reductions", cpsDefinition);
+    context.traceGraph("Shrinking reductions", cpsDefinition);
 
     // 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_ir.RegisterAllocator().visit(cpsDefinition);
 
     tree_builder.Builder builder =
-        new tree_builder.Builder(compiler.internalError);
+        new tree_builder.Builder(context.internalError);
     tree_ir.ExecutableDefinition treeDefinition = builder.build(cpsDefinition);
     assert(treeDefinition != null);
-    traceGraph('Tree builder', treeDefinition);
+    context.traceGraph('Tree builder', treeDefinition);
 
     // Transformations on the Tree IR.
     new StatementRewriter().rewrite(treeDefinition);
-    traceGraph('Statement rewriter', treeDefinition);
+    context.traceGraph('Statement rewriter', treeDefinition);
     new CopyPropagator().rewrite(treeDefinition);
-    traceGraph('Copy propagation', treeDefinition);
+    context.traceGraph('Copy propagation', treeDefinition);
     new LoopRewriter().rewrite(treeDefinition);
-    traceGraph('Loop rewriter', treeDefinition);
+    context.traceGraph('Loop rewriter', treeDefinition);
     new LogicalRewriter().rewrite(treeDefinition);
-    traceGraph('Logical rewriter', treeDefinition);
+    context.traceGraph('Logical rewriter', treeDefinition);
     new backend_ast_emitter.UnshadowParameters().unshadow(treeDefinition);
-    traceGraph('Unshadow parameters', treeDefinition);
+    context.traceGraph('Unshadow parameters', treeDefinition);
 
     TreeElementMapping treeElements = new TreeElementMapping(element);
     backend_ast.ExecutableDefinition backendAst =
         backend_ast_emitter.emit(treeDefinition);
     Node frontend_ast = backend2frontend.emit(treeElements, backendAst);
     return new ElementAst(frontend_ast, treeElements);
 
   }
 
   /**
    * Tells whether we should output given element. Corelib classes like
    * Object should not be in the resulting code.
    */
   @override
   bool shouldOutput(Element element) {
     return (!element.library.isPlatformLibrary &&
             !element.isSynthesized &&
             element is! AbstractFieldElement)
         || mirrorRenamer.isMirrorHelperLibrary(element.library);
   }
 
   void assembleProgram() {
+    ElementAstCreationContext context =
+        new _ElementAstCreationContext(compiler, constantSystem);
 
     ElementAst computeElementAst(AstElement element) {
       if (!compiler.irBuilder.hasIr(element)) {
         return new ElementAst(element.resolvedAst.node,
                               element.resolvedAst.elements);
       } else {
         cps_ir.ExecutableDefinition definition =
             compiler.irBuilder.getIr(element);
-        return createElementAst(compiler,
-            compiler.tracer, constantSystem, element, definition);
+        return createElementAst(context, element, definition);
       }
     }
 
     // TODO(johnniwinther): Remove the need for this method.
     void postProcessElementAst(
         AstElement element, ElementAst elementAst,
         newTypedefElementCallback,
         newClassElementCallback) {
       ReferencedElementCollector collector =
           new ReferencedElementCollector(compiler,
@@ skipping 297 matching lines @@
   }
 
   ConstantExpression compileMetadata(MetadataAnnotation metadata,
                            Node node,
                            TreeElements elements) {
     return measure(() {
       return constantCompiler.compileMetadata(metadata, node, elements);
     });
   }
 }
+
+abstract class ElementAstCreationContext {
+  DartTypes get dartTypes;
+  ConstantSystem get constantSystem;
+  InternalErrorFunction get internalError;
+
+  void traceCompilation(String name) {}

[karlklose, 2014/12/18 09:49:34]

Make these two functions abstract?

[Johnni Winther, 2014/12/18 10:05:38]

Done.

+  void traceGraph(String title, var irObject) {}
+}
+
+class _ElementAstCreationContext implements ElementAstCreationContext {
+  final Compiler compiler;
+  final ConstantSystem constantSystem;
+
+  _ElementAstCreationContext(this.compiler, this.constantSystem);
+
+  void traceCompilation(String name) {
+    compiler.tracer.traceCompilation(name, null);
+  }
+
+  void traceGraph(String title, var irObject) {
+    compiler.tracer.traceGraph(title, irObject);
+  }
+
+  DartTypes get dartTypes => compiler.types;
+
+  InternalErrorFunction get internalError => compiler.internalError;
+}