Validate that all instructions dominate their inputs. And fix a bug where that did not happen.

lib/compiler/implementation/ssa/tracer.dart

 // Copyright (c) 2011, 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;
 
 class HTracer extends HGraphVisitor implements Tracer {
   int indent = 0;
   final RandomAccessFile output;
   final bool enabled = GENERATE_SSA_TRACE;
 
   HTracer([String path = "dart.cfg"])
       : output = GENERATE_SSA_TRACE ? new File(path).openSync(FileMode.WRITE)
                                     : null;
 
   void close() {
     if (enabled) output.closeSync();
   }
 
+  String method;

[Lasse Reichstein Nielsen, 2012/05/30 09:35:14]

Is this used?

[ngeoffray, 2012/05/30 10:19:07]

Leftover debugging. Removed.

   void traceCompilation(String methodName) {
     tag("compilation", () {
       printProperty("name", methodName);
       printProperty("method", methodName);
       printProperty("date", new Date.now().value);
     });
   }
 
   void traceGraph(String name, HGraph graph) {
     if (!enabled) return;
@@ skipping 192 matching lines @@
     return "Continue: (B${target.id})";
   }
 
   String visitDivide(HDivide node) => visitInvokeStatic(node);
 
   String visitEquals(HEquals node) => visitInvokeStatic(node);
 
   String visitExit(HExit node) => "exit";
 
   String visitFieldGet(HFieldGet node) {
-    return 'get ${node.name.slowToString()}';
+    return 'get ${temporaryId(node.receiver)}';
   }
 
   String visitFieldSet(HFieldSet node) {
     String valueId = temporaryId(node.value);
-    return 'set ${node.name.slowToString()} to $valueId';
+    return 'set ${temporaryId(node.receiver)} to $valueId';
   }
 
   String visitGoto(HGoto node) {
     HBasicBlock target = currentBlock.successors[0];
     return "Goto: (B${target.id})";
   }
 
   String visitGreater(HGreater node) => visitInvokeStatic(node);
   String visitGreaterEqual(HGreaterEqual node) => visitInvokeStatic(node);
 
@@ skipping 133 matching lines @@
 
   String visitThrow(HThrow node) => "Throw ${temporaryId(node.inputs[0])}";
 
   String visitTruncatingDivide(HTruncatingDivide node) {
     return visitInvokeStatic(node);
   }
 
   String visitTry(HTry node) {
     List<HBasicBlock> successors = currentBlock.successors;
     String tryBlock = 'B${successors[0].id}';
-    StringBuffer catchBlocks = new StringBuffer();
-    for (int i = 1; i < successors.length - 1; i++) {
-      catchBlocks.add('B${successors[i].id}, ');
+    String catchBlock = 'none';
+    if (node.catchBlock != null) {
+      catchBlock = 'B${successors[1].id}';
     }
 
-    String finallyBlock;
+    String finallyBlock = 'none';
     if (node.finallyBlock != null) {
       finallyBlock = 'B${node.finallyBlock.id}';
-    } else {
-      catchBlocks.add('B${successors[successors.length - 1].id}');
-      finallyBlock = 'none';
     }
-    return "Try: $tryBlock, Catch: $catchBlocks, Finally: $finallyBlock";
+
+    return "Try: $tryBlock, Catch: $catchBlock, Finally: $finallyBlock, "
+        "Join: B${successors.last().id}";
   }
 
   String visitTypeGuard(HTypeGuard node) {
     String type;
     switch (node.guardedType) {
       case HType.MUTABLE_ARRAY: type = "mutable_array"; break;
       case HType.READABLE_ARRAY: type = "readable_array"; break;
       case HType.EXTENDABLE_ARRAY: type = "extendable_array"; break;
       case HType.BOOLEAN: type = "bool"; break;
       case HType.INTEGER: type = "integer"; break;
@@ skipping 22 matching lines @@
   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";
   }
 }