# HG changeset patch # User Gilles Duboscq # Date 1329761952 -3600 # Node ID bdf2eb70ef3e8fb741b5f5070ae764edfd0c72e6 # Parent 4e9d904a4d1a336f2d57cf28e53b5bf7b0e917a8 Kill CallTargetNode and FrameState in killCFG to avoid keeping some invalid nodes alive diff -r 4e9d904a4d1a -r bdf2eb70ef3e graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/util/GraphUtil.java --- a/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/util/GraphUtil.java Mon Feb 20 16:37:23 2012 +0100 +++ b/graal/com.oracle.max.graal.nodes/src/com/oracle/max/graal/nodes/util/GraphUtil.java Mon Feb 20 19:19:12 2012 +0100 @@ -72,7 +72,7 @@ public static void propagateKill(Node node) { if (node != null && node.isAlive()) { - List usagesSnapshot = node.usages().filter(isA(FloatingNode.class).or(CallTargetNode.class)).snapshot(); + List usagesSnapshot = node.usages().filter(isA(FloatingNode.class).or(CallTargetNode.class).or(FrameState.class)).snapshot(); // null out remaining usages node.replaceAtUsages(null); @@ -92,10 +92,10 @@ } public static void killUnusedFloatingInputs(Node node) { - List floatingInputs = node.inputs().filter(FloatingNode.class).snapshot(); + List floatingInputs = node.inputs().filter(isA(FloatingNode.class).or(CallTargetNode.class).or(FrameState.class)).snapshot(); node.safeDelete(); - for (FloatingNode in : floatingInputs) { + for (Node in : floatingInputs) { if (in.isAlive() && in.usages().isEmpty()) { killUnusedFloatingInputs(in); }