# HG changeset patch # User Doug Simon # Date 1366993270 -7200 # Node ID e1200d5141fa0ee3bbf9316f1b533615b71da6e9 # Parent 47e7933283f1c5f28adf8c40b3d6b1c2990769cb generalized invoke intrinsification when being replaced by a ControlSinkNode diff -r 47e7933283f1 -r e1200d5141fa graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Fri Apr 26 18:16:30 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Fri Apr 26 18:21:10 2013 +0200 @@ -144,7 +144,7 @@ } if (node instanceof FixedWithNextNode) { ((StructuredGraph) graph()).replaceFixedWithFixed(this, (FixedWithNextNode) node); - } else if (node instanceof DeoptimizeNode) { + } else if (node instanceof ControlSinkNode) { this.replaceAtPredecessor(node); this.replaceAtUsages(null); GraphUtil.killCFG(this); diff -r 47e7933283f1 -r e1200d5141fa graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Fri Apr 26 18:16:30 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Fri Apr 26 18:21:10 2013 +0200 @@ -188,7 +188,7 @@ if (node == null) { assert kind() == Kind.Void && usages().isEmpty(); ((StructuredGraph) graph()).removeSplit(this, next()); - } else if (node instanceof DeoptimizeNode) { + } else if (node instanceof ControlSinkNode) { this.replaceAtPredecessor(node); this.replaceAtUsages(null); GraphUtil.killCFG(this);