# HG changeset patch
# User Christian Wimmer <christian.wimmer@oracle.com>
# Date 1323839905 28800
# Node ID 3f6325ddd3912f39cd07a5e2c667c062bde48d23
# Parent  b648304ba4ff2333c121f7da22e41e88bfb52a81# Parent  6a2ef9284a284caa8d4bc66dd4e32c4aca4a691a
Merge

diff -r b648304ba4ff -r 3f6325ddd391 src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java
--- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java	Tue Dec 13 21:17:46 2011 -0800
+++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalCFGFilter.java	Tue Dec 13 21:18:25 2011 -0800
@@ -29,9 +29,7 @@
 import com.sun.hotspot.igv.graph.Diagram;
 import com.sun.hotspot.igv.graph.Figure;
 import com.sun.hotspot.igv.graph.InputSlot;
-import java.awt.Color;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 public class GraalCFGFilter extends AbstractFilter {
diff -r b648304ba4ff -r 3f6325ddd391 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	Tue Dec 13 21:17:46 2011 -0800
+++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/GraalEdgeColorFilter.java	Tue Dec 13 21:18:25 2011 -0800
@@ -54,7 +54,12 @@
         List<Figure> figures = d.getFigures();
         for (Figure f : figures) {
             Properties p = f.getProperties();
-            int predCount = Integer.parseInt(p.get("predecessorCount"));
+            int predCount;
+            if (p.get("predecessorCount") != null) {
+                predCount = Integer.parseInt(p.get("predecessorCount"));
+            } else {
+                predCount = 0;
+            }
             for (InputSlot is : f.getInputSlots()) {
                 Color color;
                 if (is.getPosition() < predCount) {
@@ -65,7 +70,7 @@
 
                 is.setColor(color);
                 for (Connection c : is.getConnections()) {
-                    if (!c.getLabel().endsWith("#NDF")) {
+                    if (c.getLabel() == null || !c.getLabel().endsWith("#NDF")) {
                         c.setColor(color);
                     } else if ("EndNode".equals(c.getOutputSlot().getFigure().getProperties().get("class"))
                             || "EndNode".equals(c.getOutputSlot().getProperties().get("class"))) {
diff -r b648304ba4ff -r 3f6325ddd391 src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/cfg.filter
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/filters/cfg.filter	Tue Dec 13 21:18:25 2011 -0800
@@ -0,0 +1,2 @@
+var f = new com.sun.hotspot.igv.graal.filters.GraalCFGFilter();
+f.apply(graph);
diff -r b648304ba4ff -r 3f6325ddd391 src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/layer.xml
--- a/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/layer.xml	Tue Dec 13 21:17:46 2011 -0800
+++ b/src/share/tools/IdealGraphVisualizer/Graal/src/com/sun/hotspot/igv/graal/layer.xml	Tue Dec 13 21:18:25 2011 -0800
@@ -33,5 +33,9 @@
         <file name="Graal Call Analysis" url="filters/callgraph.filter">
             <attr name="enabled" boolvalue="false"/>
         </file>
+        
+        <file name="Graal CFG-only" url="filters/cfg.filter">
+            <attr name="enabled" boolvalue="false"/>
+        </file>
     </folder>
 </filesystem>