Mercurial > hg > graal-compiler
changeset 3151:906a2e39495b
Merge.
author | Thomas Wuerthinger <thomas@wuerthinger.net> |
---|---|
date | Tue, 05 Jul 2011 14:12:00 +0200 |
parents | 2c07f39c2f4d (current diff) 03aca60eb99f (diff) |
children | 3e89c4c5f37f |
files | |
diffstat | 2 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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>() {
--- 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 {