# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1312995167 -7200
# Node ID 6e806c37340561d80a38889bc33457294859eaed
# Parent  e4616e3d207bae00e4b2a1448e085cb428ab39d6# Parent  e54641d0d012ac88ea93c1ee2649f689a88fdd61
merge

diff -r e4616e3d207b -r 6e806c373405 src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/GraalGraphToTextConverter.java
--- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/GraalGraphToTextConverter.java	Wed Aug 10 18:19:09 2011 +0200
+++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/GraalGraphToTextConverter.java	Wed Aug 10 18:52:47 2011 +0200
@@ -122,8 +122,8 @@
         //       and for slots that are connected with multiple edges, by
         //       from/to node
 
-        int succCount = Integer.parseInt(n.getProperties().get("successorCount"));
         InputEdge[] outgoing = outgoingEdges.get(n).toArray(new InputEdge[0]);
+        int succCount = outgoing.length - Integer.parseInt(n.getProperties().get("usageCount"));
 
         int i = 0;
         if (outgoing.length > 0 && outgoing[0].getFromIndex() < succCount) {
diff -r e4616e3d207b -r 6e806c373405 src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java
--- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java	Wed Aug 10 18:19:09 2011 +0200
+++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java	Wed Aug 10 18:52:47 2011 +0200
@@ -70,22 +70,6 @@
                 }
             }
         }
-        for (Figure f : figures) {
-            Properties p = f.getProperties();
-            int predCount = Integer.parseInt(p.get("predecessorCount"));
-            int inputCount = Integer.parseInt(p.get("inputCount"));
-            int variableInputCount = Integer.parseInt(p.get("variableInputCount"));
-            if (p.get("memoryCheckpoint") != null) {
-                for (InputSlot is : f.getInputSlots()) {
-                    if (is.getPosition() > predCount + inputCount - variableInputCount) {
-                        is.setColor(memoryColor);
-                        for (Connection c : is.getConnections()) {
-                            c.setColor(memoryColor);
-                        }
-                    }
-                }
-            }
-        }
     }
 
     public Color getUsageColor() {