Move types out of the HInstructions.

lib/compiler/implementation/ssa/builder.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.
 
 class Interceptors {
   Compiler compiler;
   Interceptors(Compiler this.compiler);
 
   SourceString mapOperatorToMethodName(Operator op) {
     String name = op.source.stringValue;
@@ skipping 120 matching lines @@
   }
 }
 
 class SsaBuilderTask extends CompilerTask {
   final Interceptors interceptors;
   final Map<Node, ClosureData> closureDataCache;
   final CodeEmitterTask emitter;
   // Loop tracking information.
   final Set<FunctionElement> functionsCalledInLoop;
   final Map<SourceString, Selector> selectorsCalledInLoop;
+  final JavaScriptBackend backend;

[Lasse Reichstein Nielsen, 2012/08/08 07:44:53]

Is this used?

[floitsch, 2012/08/08 19:18:37]

Done.

 
   String get name() => 'SSA builder';
 
   SsaBuilderTask(JavaScriptBackend backend)
     : interceptors = new Interceptors(backend.compiler),
       closureDataCache = new HashMap<Node, ClosureData>(),
       emitter = backend.emitter,
       functionsCalledInLoop = new Set<FunctionElement>(),
       selectorsCalledInLoop = new Map<SourceString, Selector>(),
+      this.backend = backend,
       super(backend.compiler);
 
-  HGraph build(WorkItem work) {
+  HGraph build(JavaScriptWorkItem work) {
     return measure(() {
       FunctionElement element = work.element;
       HInstruction.idCounter = 0;
       SsaBuilder builder = new SsaBuilder(this, work);
       HGraph graph;
       ElementKind kind = element.kind;
       if (kind === ElementKind.GENERATIVE_CONSTRUCTOR) {
         graph = compileConstructor(builder, work);
       } else if (kind === ElementKind.GENERATIVE_CONSTRUCTOR_BODY ||
                  kind === ElementKind.FUNCTION ||
@@ skipping 14 matching lines @@
             element.enclosingElement.kind == ElementKind.CLASS) {
           String className = element.enclosingElement.name.slowToString();
           String memberName = element.name.slowToString();
           name = "$className.$memberName";
           if (element.kind == ElementKind.GENERATIVE_CONSTRUCTOR_BODY) {
             name = "$name (body)";
           }
         } else {
           name = "${element.name.slowToString()}";
         }
-        compiler.tracer.traceCompilation(name);
+        compiler.tracer.traceCompilation(name, work);
         compiler.tracer.traceGraph('builder', graph);
       }
       return graph;
     });
   }
 
   HGraph compileConstructor(SsaBuilder builder, WorkItem work) {
     // The body of the constructor will be generated in a separate function.
     final ClassElement classElement = work.element.enclosingElement;
     return builder.buildFactory(classElement, work.element);
@@ skipping 3387 matching lines @@
           new HSubGraphBlockInformation(elseBranch.graph));
 
     HBasicBlock conditionStartBlock = conditionBranch.block;
     conditionStartBlock.setBlockFlow(info, joinBlock);
     SubGraph conditionGraph = conditionBranch.graph;
     HIf branch = conditionGraph.end.last;
     assert(branch is HIf);
     branch.blockInformation = conditionStartBlock.blockFlow;
   }
 }