# HG changeset patch
# User Roland Schatz <roland.schatz@oracle.com>
# Date 1395922832 -3600
# Node ID 01786db19f7d3f1748c48c6237b3fc826534ad14
# Parent  145949aeeccb95cd5e62e97d381a57868634cca2
Rename deoptState fields to reflect whether they refer to a state before or during.

diff -r 145949aeeccb -r 01786db19f7d graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PreWriteBarrier.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PreWriteBarrier.java	Thu Mar 27 13:20:19 2014 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/G1PreWriteBarrier.java	Thu Mar 27 13:20:32 2014 +0100
@@ -27,7 +27,7 @@
 
 public class G1PreWriteBarrier extends WriteBarrier implements DeoptimizingNode.DeoptBefore {
 
-    @Input private FrameState deoptimizationState;
+    @Input private FrameState stateBefore;
     private final boolean nullCheck;
     private final boolean doLoad;
 
@@ -56,12 +56,12 @@
 
     @Override
     public FrameState stateBefore() {
-        return deoptimizationState;
+        return stateBefore;
     }
 
     @Override
     public void setStateBefore(FrameState state) {
-        updateUsages(deoptimizationState, state);
-        deoptimizationState = state;
+        updateUsages(stateBefore, state);
+        stateBefore = state;
     }
 }
diff -r 145949aeeccb -r 01786db19f7d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractDeoptimizeNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractDeoptimizeNode.java	Thu Mar 27 13:20:19 2014 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractDeoptimizeNode.java	Thu Mar 27 13:20:32 2014 +0100
@@ -34,7 +34,7 @@
  */
 public abstract class AbstractDeoptimizeNode extends ControlSinkNode implements IterableNodeType, DeoptimizingNode.DeoptBefore {
 
-    @Input private FrameState deoptState;
+    @Input private FrameState stateBefore;
 
     public AbstractDeoptimizeNode() {
         super(StampFactory.forVoid());
@@ -47,13 +47,13 @@
 
     @Override
     public FrameState stateBefore() {
-        return deoptState;
+        return stateBefore;
     }
 
     @Override
     public void setStateBefore(FrameState f) {
-        updateUsages(deoptState, f);
-        deoptState = f;
+        updateUsages(stateBefore, f);
+        stateBefore = f;
     }
 
     public abstract ValueNode getActionAndReason(MetaAccessProvider metaAccess);
diff -r 145949aeeccb -r 01786db19f7d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizingFixedWithNextNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizingFixedWithNextNode.java	Thu Mar 27 13:20:19 2014 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/DeoptimizingFixedWithNextNode.java	Thu Mar 27 13:20:32 2014 +0100
@@ -26,7 +26,7 @@
 
 public abstract class DeoptimizingFixedWithNextNode extends FixedWithNextNode implements DeoptimizingNode.DeoptBefore {
 
-    @Input(notDataflow = true) private FrameState deoptState;
+    @Input(notDataflow = true) private FrameState stateBefore;
 
     public DeoptimizingFixedWithNextNode(Stamp stamp) {
         super(stamp);
@@ -34,12 +34,12 @@
 
     @Override
     public FrameState stateBefore() {
-        return deoptState;
+        return stateBefore;
     }
 
     @Override
     public void setStateBefore(FrameState f) {
-        updateUsages(deoptState, f);
-        deoptState = f;
+        updateUsages(stateBefore, f);
+        stateBefore = f;
     }
 }
diff -r 145949aeeccb -r 01786db19f7d 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	Thu Mar 27 13:20:19 2014 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeNode.java	Thu Mar 27 13:20:32 2014 +0100
@@ -38,7 +38,7 @@
 public final class InvokeNode extends AbstractMemoryCheckpoint implements Invoke, LIRLowerable, MemoryCheckpoint.Single {
 
     @Input private CallTargetNode callTarget;
-    @Input private FrameState deoptState;
+    @Input private FrameState stateDuring;
     @Input private GuardingNode guard;
     private final int bci;
     private boolean polymorphic;
@@ -164,20 +164,20 @@
 
     @Override
     public FrameState stateDuring() {
-        return deoptState;
+        return stateDuring;
     }
 
     @Override
     public void setStateDuring(FrameState stateDuring) {
-        updateUsages(deoptState, stateDuring);
-        deoptState = stateDuring;
+        updateUsages(this.stateDuring, stateDuring);
+        this.stateDuring = stateDuring;
     }
 
     @Override
     public void computeStateDuring(FrameState stateAfter) {
-        FrameState stateDuring = stateAfter.duplicateModified(bci(), stateAfter.rethrowException(), getKind());
-        stateDuring.setDuringCall(true);
-        setStateDuring(stateDuring);
+        FrameState newStateDuring = stateAfter.duplicateModified(bci(), stateAfter.rethrowException(), getKind());
+        newStateDuring.setDuringCall(true);
+        setStateDuring(newStateDuring);
     }
 
     @Override
diff -r 145949aeeccb -r 01786db19f7d 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	Thu Mar 27 13:20:19 2014 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java	Thu Mar 27 13:20:32 2014 +0100
@@ -39,7 +39,7 @@
     @Successor private AbstractBeginNode next;
     @Successor private DispatchBeginNode exceptionEdge;
     @Input private CallTargetNode callTarget;
-    @Input private FrameState deoptState;
+    @Input private FrameState stateDuring;
     @Input private FrameState stateAfter;
     @Input private GuardingNode guard;
     private final int bci;
@@ -213,20 +213,20 @@
 
     @Override
     public FrameState stateDuring() {
-        return deoptState;
+        return stateDuring;
     }
 
     @Override
     public void setStateDuring(FrameState stateDuring) {
-        updateUsages(deoptState, stateDuring);
-        deoptState = stateDuring;
+        updateUsages(this.stateDuring, stateDuring);
+        this.stateDuring = stateDuring;
     }
 
     @Override
     public void computeStateDuring(FrameState tempStateAfter) {
-        FrameState stateDuring = tempStateAfter.duplicateModified(bci(), tempStateAfter.rethrowException(), getKind());
-        stateDuring.setDuringCall(true);
-        setStateDuring(stateDuring);
+        FrameState newStateDuring = tempStateAfter.duplicateModified(bci(), tempStateAfter.rethrowException(), getKind());
+        newStateDuring.setDuringCall(true);
+        setStateDuring(newStateDuring);
     }
 
     @Override
diff -r 145949aeeccb -r 01786db19f7d graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java	Thu Mar 27 13:20:19 2014 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/ForeignCallNode.java	Thu Mar 27 13:20:32 2014 +0100
@@ -39,7 +39,7 @@
 
     @Input private final NodeInputList<ValueNode> arguments;
     private final ForeignCallsProvider foreignCalls;
-    @Input private FrameState deoptState;
+    @Input private FrameState stateDuring;
 
     private final ForeignCallDescriptor descriptor;
 
@@ -102,24 +102,24 @@
 
     @Override
     public FrameState stateDuring() {
-        return deoptState;
+        return stateDuring;
     }
 
     @Override
     public void setStateDuring(FrameState stateDuring) {
-        updateUsages(deoptState, stateDuring);
-        deoptState = stateDuring;
+        updateUsages(this.stateDuring, stateDuring);
+        this.stateDuring = stateDuring;
     }
 
     @Override
     public void computeStateDuring(FrameState stateAfter) {
-        FrameState stateDuring;
+        FrameState newStateDuring;
         if ((stateAfter.stackSize() > 0 && stateAfter.stackAt(stateAfter.stackSize() - 1) == this) || (stateAfter.stackSize() > 1 && stateAfter.stackAt(stateAfter.stackSize() - 2) == this)) {
-            stateDuring = stateAfter.duplicateModified(stateAfter.bci, stateAfter.rethrowException(), this.getKind());
+            newStateDuring = stateAfter.duplicateModified(stateAfter.bci, stateAfter.rethrowException(), this.getKind());
         } else {
-            stateDuring = stateAfter;
+            newStateDuring = stateAfter;
         }
-        setStateDuring(stateDuring);
+        setStateDuring(newStateDuring);
     }
 
     @Override