Split TypeGuard and BailoutTarget.

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');
 
@@ skipping 186 matching lines @@
         prefix = 'r';
       } else if (type == HType.NULL) {
         prefix = 'u';
       } else {
         prefix = 'x';
       }
     }
     return "$prefix${instruction.id}";
   }
 
+  String visitBailoutTarget(HBailoutTarget node) {
+    StringBuffer envBuffer = new StringBuffer();
+    List<HInstruction> inputs = node.inputs;
+    for (int i = 0; i < inputs.length; i++) {
+      envBuffer.add(" ${temporaryId(inputs[i])}");
+    }
+    String on = node.isEnabled ? "enabled" : "disabled";
+    return "BailoutTarget($on): id: ${node.state} env: $envBuffer";
+  }
+
   String visitBoolify(HBoolify node) {
     return "Boolify: ${temporaryId(node.inputs[0])}";
   }
 
   String visitAdd(HAdd node) => visitInvokeStatic(node);
 
   String visitBitAnd(HBitAnd node) => visitInvokeStatic(node);
 
   String visitBitNot(HBitNot node) => visitInvokeStatic(node);
 
@@ skipping 255 matching lines @@
       type = "number";
     } else if (guardedType == HType.STRING) {
       type = "string";
     } else if (guardedType == HType.INDEXABLE_PRIMITIVE) {
       type = "string_or_array";
     } else if (guardedType == HType.UNKNOWN) {
       type = 'unknown';
     } else {
       throw new CompilerCancelledException('Unexpected type guard: $type');
     }
+    HInstruction guarded = node.guarded;
+    HInstruction bailoutTarget = node.bailoutTarget;
     StringBuffer envBuffer = new StringBuffer();
     List<HInstruction> inputs = node.inputs;
+    bool skippedFirstGuarded = false;
     for (int i = 0; i < inputs.length; i++) {
-      if (inputs[i] !== node.guarded) {
-        envBuffer.add(" ${temporaryId(inputs[i])}");
+      if (inputs[i] == guarded && !skippedFirstGuarded) {
+        skippedFirstGuarded = true;

[ricow1, 2012/07/23 12:52:26]

you should add a comment explaining why we can safely skip this

[floitsch, 2012/07/23 13:27:48]

refactored code.

+        continue;
       }
+      if (inputs[i] != bailoutTarget) continue;
+      envBuffer.add(" ${temporaryId(inputs[i])}");
     }
     String on = node.isEnabled ? "enabled" : "disabled";
-    String id = temporaryId(node.guarded);
-    return "TypeGuard($on): $id is $type env: $envBuffer";
+    String guardedId = temporaryId(node.guarded);
+    String bailoutId = temporaryId(node.bailoutTarget);
+    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";
   }
 }