# HG changeset patch # User Gilles Duboscq # Date 1398180717 -7200 # Node ID 9f83343a5a743d26e9bce7054327961fec090ea5 # Parent 98d45600222cc229988dabcdb5e9c0a3d0ed05f3 Move (InvokeNode|InvokeWithExceptionNode).computeStateDuring to Invoke diff -r 98d45600222c -r 9f83343a5a74 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java Tue Apr 22 19:23:38 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/Invoke.java Tue Apr 22 17:31:57 2014 +0200 @@ -78,4 +78,11 @@ default ResolvedJavaType getContextType() { return getContextMethod().getDeclaringClass(); } + + @Override + default void computeStateDuring(FrameState stateAfter) { + FrameState newStateDuring = stateAfter.duplicateModified(bci(), stateAfter.rethrowException(), asNode().getKind()); + newStateDuring.setDuringCall(true); + setStateDuring(newStateDuring); + } } diff -r 98d45600222c -r 9f83343a5a74 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 Tue Apr 22 19:23:38 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java Tue Apr 22 17:31:57 2014 +0200 @@ -185,13 +185,6 @@ } @Override - public void computeStateDuring(FrameState stateAfter) { - FrameState newStateDuring = stateAfter.duplicateModified(bci(), stateAfter.rethrowException(), getKind()); - newStateDuring.setDuringCall(true); - setStateDuring(newStateDuring); - } - - @Override public GuardingNode getGuard() { return guard; } diff -r 98d45600222c -r 9f83343a5a74 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 Tue Apr 22 19:23:38 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java Tue Apr 22 17:31:57 2014 +0200 @@ -223,13 +223,6 @@ } @Override - public void computeStateDuring(FrameState tempStateAfter) { - FrameState newStateDuring = tempStateAfter.duplicateModified(bci(), tempStateAfter.rethrowException(), getKind()); - newStateDuring.setDuringCall(true); - setStateDuring(newStateDuring); - } - - @Override public GuardingNode getGuard() { return guard; }