# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1309867920 -7200
# Node ID 906a2e39495b1df82e5b98b88789cd8699a8f8a4
# Parent  2c07f39c2f4db546257c691073b7d24163a0f2ae# Parent  03aca60eb99fc08be356ff9856aeaf1e68afb9a4
Merge.

diff -r 2c07f39c2f4d -r 906a2e39495b graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StateSplit.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StateSplit.java	Tue Jul 05 14:09:44 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/ir/StateSplit.java	Tue Jul 05 14:12:00 2011 +0200
@@ -76,6 +76,17 @@
     }
 
     @Override
+    public void delete() {
+        FrameState stateAfter = stateAfter();
+        super.delete();
+        if (stateAfter != null) {
+            if (stateAfter.usages().isEmpty()) {
+                stateAfter.delete();
+            }
+        }
+    }
+
+    @Override
     public Iterable< ? extends Node> dataInputs() {
         final Iterator< ? extends Node> dataInputs = super.dataInputs().iterator();
         return new Iterable<Node>() {
diff -r 2c07f39c2f4d -r 906a2e39495b graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/DeadCodeEliminationPhase.java
diff -r 2c07f39c2f4d -r 906a2e39495b src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardGroupOrganizer.java
--- a/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardGroupOrganizer.java	Tue Jul 05 14:09:44 2011 +0200
+++ b/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardGroupOrganizer.java	Tue Jul 05 14:12:00 2011 +0200
@@ -50,7 +50,7 @@
             for (Group g : groups) {
                 List<Group> children = new ArrayList<Group>();
                 children.add(g);
-                if(g.getGraphs().size() == 1) {
+                if(false && g.getGraphs().size() == 1) {
                     //g.getGraphs().get(0).setName(g.getName() + " / " + g.getGraphs().get(0).getName());
                     result.add(new Pair<String, List<Group>>("", children));
                 } else {