comparison graal/com.oracle.graal.snippets/src/com/oracle/graal/snippets/SnippetIntrinsificationPhase.java @ 7257:b1ebd583be14

Remove @Successor private final NodeSuccessorList<BeginNode> blockSuccessors from ControlSplitNode Use normal successor fields in IfNode and InvokeWithException MergeableState.afterSplit(FixedNode) is now MergeableState.afterSplit(BeginNode)
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 18 Dec 2012 11:27:12 +0100
parents 04632e376bd8
children 5e3d1a68664e
comparison
equal deleted inserted replaced
7254:9e155cd2bb2f 7257:b1ebd583be14
219 if (invokeNode instanceof InvokeWithExceptionNode) { 219 if (invokeNode instanceof InvokeWithExceptionNode) {
220 // Destroy exception edge & clear stateAfter. 220 // Destroy exception edge & clear stateAfter.
221 InvokeWithExceptionNode invokeWithExceptionNode = (InvokeWithExceptionNode) invokeNode; 221 InvokeWithExceptionNode invokeWithExceptionNode = (InvokeWithExceptionNode) invokeNode;
222 222
223 invokeWithExceptionNode.killExceptionEdge(); 223 invokeWithExceptionNode.killExceptionEdge();
224 graph.removeSplit(invokeWithExceptionNode, InvokeWithExceptionNode.NORMAL_EDGE); 224 graph.removeSplit(invokeWithExceptionNode, invokeWithExceptionNode.next());
225 } else { 225 } else {
226 graph.removeFixed((InvokeNode) invokeNode); 226 graph.removeFixed((InvokeNode) invokeNode);
227 } 227 }
228 stateAfter.safeDelete(); 228 stateAfter.safeDelete();
229 GraphUtil.propagateKill(callTarget); 229 GraphUtil.propagateKill(callTarget);
379 if (invokeNode instanceof InvokeWithExceptionNode) { 379 if (invokeNode instanceof InvokeWithExceptionNode) {
380 // Destroy exception edge & clear stateAfter. 380 // Destroy exception edge & clear stateAfter.
381 InvokeWithExceptionNode invokeWithExceptionNode = (InvokeWithExceptionNode) invokeNode; 381 InvokeWithExceptionNode invokeWithExceptionNode = (InvokeWithExceptionNode) invokeNode;
382 382
383 invokeWithExceptionNode.killExceptionEdge(); 383 invokeWithExceptionNode.killExceptionEdge();
384 graph.removeSplit(invokeWithExceptionNode, InvokeWithExceptionNode.NORMAL_EDGE); 384 graph.removeSplit(invokeWithExceptionNode, invokeWithExceptionNode.next());
385 } else { 385 } else {
386 graph.removeFixed((InvokeNode) invokeNode); 386 graph.removeFixed((InvokeNode) invokeNode);
387 } 387 }
388 checkCastCallTarget.safeDelete(); 388 checkCastCallTarget.safeDelete();
389 } else if (checkCastUsage instanceof FrameState) { 389 } else if (checkCastUsage instanceof FrameState) {