# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1328092610 -3600
# Node ID e952b6c6949b67600f5d4c2a684314e5bf82e450
# Parent  168dd8970b964fb1c65dec0b9b209ba24edc6052# Parent  2302b1514e7e13561493eb0e6e8bc4fa7a4dfdbf
Merge

diff -r 168dd8970b96 -r e952b6c6949b graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/Node.java
--- a/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/Node.java	Wed Feb 01 11:35:57 2012 +0100
+++ b/graal/com.oracle.max.graal.graph/src/com/oracle/max/graal/graph/Node.java	Wed Feb 01 11:36:50 2012 +0100
@@ -496,11 +496,11 @@
     @Override
     public void formatTo(Formatter formatter, int flags, int width, int precision) {
         if ((flags & FormattableFlags.ALTERNATE) == FormattableFlags.ALTERNATE) {
-            formatter.format(toString(Verbosity.Id));
+            formatter.format("%s", toString(Verbosity.Id));
         } else if ((flags & FormattableFlags.UPPERCASE) == FormattableFlags.UPPERCASE) {
-            formatter.format(toString(Verbosity.Long));
+            formatter.format("%s", toString(Verbosity.Long));
         } else {
-            formatter.format(toString(Verbosity.Short));
+            formatter.format("%s", toString(Verbosity.Short));
         }
 
         boolean neighborsAlternate = ((flags & FormattableFlags.LEFT_JUSTIFY) == FormattableFlags.LEFT_JUSTIFY);
diff -r 168dd8970b96 -r e952b6c6949b graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/StructuredGraph.java
--- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/StructuredGraph.java	Wed Feb 01 11:35:57 2012 +0100
+++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/StructuredGraph.java	Wed Feb 01 11:36:50 2012 +0100
@@ -173,6 +173,7 @@
 
     public void replaceFixedWithFixed(FixedWithNextNode node, FixedWithNextNode replacement) {
         assert node != null && replacement != null && node.isAlive() && replacement.isAlive() : "cannot replace " + node + " with " + replacement;
+        replacement.setProbability(node.probability());
         FixedNode next = node.next();
         node.setNext(null);
         replacement.setNext(next);
@@ -268,6 +269,7 @@
     public void addAfterFixed(FixedWithNextNode node, FixedWithNextNode newNode) {
         assert node != null && newNode != null && node.isAlive() && newNode.isAlive() : "cannot add " + newNode + " after " + node;
         assert newNode.next() == null;
+        newNode.setProbability(node.probability());
         FixedNode next = node.next();
         node.setNext(newNode);
         newNode.setNext(next);
@@ -277,6 +279,7 @@
         assert node != null && newNode != null && node.isAlive() && newNode.isAlive() : "cannot add " + newNode + " before " + node;
         assert node.predecessor() != null && node.predecessor() instanceof FixedWithNextNode : "cannot add " + newNode + " before " + node;
         assert newNode.next() == null;
+        newNode.setProbability(node.probability());
         FixedWithNextNode pred = (FixedWithNextNode) node.predecessor();
         pred.setNext(newNode);
         newNode.setNext(node);