Move types out of the HInstructions.

lib/compiler/implementation/ssa/tracer.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.
 
 #library('tracer');
 
 #import('dart:io');
 #import('ssa.dart');
 #import('../leg.dart');
 
 final bool GENERATE_SSA_TRACE = false;
 final String SSA_TRACE_FILTER = null;
 
 class HTracer extends HGraphVisitor implements Tracer {
+  JavaScriptWorkItem work;
   int indent = 0;
   final RandomAccessFile output;
   final bool enabled = GENERATE_SSA_TRACE;
   bool traceActive = false;
 
   HTracer([String path = "dart.cfg"])
       : output = GENERATE_SSA_TRACE ? new File(path).openSync(FileMode.WRITE)
                                     : null;
 
   void close() {
     if (enabled) output.closeSync();
   }
 
-  void traceCompilation(String methodName) {
+  void traceCompilation(String methodName, JavaScriptWorkItem workItem) {
     if (!enabled) return;
+    this.work = workItem;
     traceActive =
         SSA_TRACE_FILTER == null || methodName.contains(SSA_TRACE_FILTER);
     if (!traceActive) return;
     tag("compilation", () {
       printProperty("name", methodName);
       printProperty("method", methodName);
       printProperty("date", new Date.now().millisecondsSinceEpoch);
     });
   }
 
@@ skipping 26 matching lines @@
       add("successors");
       for (HBasicBlock successor in block.successors) {
         add(' "B${successor.id}"');
       }
       add("\n");
     }
   }
 
   void addInstructions(HInstructionStringifier stringifier,
                        HInstructionList list) {
+    HTypeMap types = work.types;
     for (HInstruction instruction = list.first;
          instruction !== null;
          instruction = instruction.next) {
       int bci = 0;
       int uses = instruction.usedBy.length;
-      String changes = instruction.hasSideEffects() ? '!' : ' ';
+      String changes = instruction.hasSideEffects(types) ? '!' : ' ';
       String depends = instruction.dependsOnSomething() ? '?' : '';
       addIndent();
       String temporaryId = stringifier.temporaryId(instruction);
       String instructionString = stringifier.visit(instruction);
       add("$bci $uses $temporaryId $instructionString $changes $depends <|@\n");
     }
   }
 
   void visitBasicBlock(HBasicBlock block) {
-    HInstructionStringifier stringifier = new HInstructionStringifier(block);
+    HInstructionStringifier stringifier =
+        new HInstructionStringifier(work, block);
     assert(block.id !== null);
     tag("block", () {
       printProperty("name", "B${block.id}");
       printProperty("from_bci", -1);
       printProperty("to_bci", -1);
       addPredecessors(block);
       addSuccessors(block);
       printEmptyProperty("xhandlers");
       printEmptyProperty("flags");
       if (block.dominator !== null) {
@@ skipping 52 matching lines @@
   }
 
   void addIndent() {
     for (int i = 0; i < indent; i++) {
       add("  ");
     }
   }
 }
 
 class HInstructionStringifier implements HVisitor<String> {
+  JavaScriptWorkItem work;
   HBasicBlock currentBlock;
 
-  HInstructionStringifier(this.currentBlock);
+  HInstructionStringifier(this.work, this.currentBlock);
 
   visit(HInstruction node) => node.accept(this);
 
   String temporaryId(HInstruction instruction) {
     String prefix;
-    HType type = instruction.propagatedType;
+    HType type = work.types[instruction];
     if (!type.isPrimitive()) {
       prefix = 'U';
     } else {
       if (type == HType.MUTABLE_ARRAY) {
         prefix = 'm';
       } else if (type == HType.READABLE_ARRAY) {
         prefix = 'a';
       } else if (type == HType.EXTENDABLE_ARRAY) {
         prefix = 'e';
       } else if (type == HType.BOOLEAN) {
@@ skipping 322 matching lines @@
     return "TypeGuard($on): $guardedId is $type bailout: $bailoutId "
            "env: $envBuffer";
   }
 
   String visitIs(HIs node) {
     String type = node.typeExpression.toString();
     return "TypeTest: ${temporaryId(node.expression)} is $type";
   }
 
   String visitTypeConversion(HTypeConversion node) {
-    String type = node.propagatedType.toString();
-    return "TypeConversion: ${temporaryId(node.inputs[0])} to $type";
+    return "TypeConversion: ${temporaryId(node.inputs[0])} to ${node.type}";
   }
 }