# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1395924867 -3600
# Node ID a5373295d454e6dbeeef3810bcb61899fe9513af
# Parent  fbae9be45c9561134eba63b325ae36cebde5cf2c
Remove state*() from NodeLIRGenerator.

diff -r fbae9be45c95 -r a5373295d454 graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64MemoryPeephole.java
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64MemoryPeephole.java	Wed Mar 26 20:44:11 2014 +0100
+++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64MemoryPeephole.java	Thu Mar 27 13:54:27 2014 +0100
@@ -71,7 +71,7 @@
 
     protected LIRFrameState getState(Access access) {
         if (access instanceof DeoptimizingNode) {
-            return gen.state((DeoptimizingNode) access);
+            return gen.getLIRGenerator().state((DeoptimizingNode) access);
         }
         return null;
     }
diff -r fbae9be45c95 -r a5373295d454 graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64NodeLIRGenerator.java
--- a/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64NodeLIRGenerator.java	Wed Mar 26 20:44:11 2014 +0100
+++ b/graal/com.oracle.graal.compiler.amd64/src/com/oracle/graal/compiler/amd64/AMD64NodeLIRGenerator.java	Thu Mar 27 13:54:27 2014 +0100
@@ -60,7 +60,7 @@
     @Override
     public void emitNullCheck(ValueNode v, DeoptimizingNode deopt) {
         assert v.getKind() == Kind.Object : v + " - " + v.stamp() + " @ " + deopt;
-        append(new AMD64Move.NullCheckOp(gen.load(operand(v)), state(deopt)));
+        append(new AMD64Move.NullCheckOp(gen.load(operand(v)), gen.state(deopt)));
     }
 
     @Override
@@ -103,7 +103,7 @@
 
     @Override
     public void visitInfopointNode(InfopointNode i) {
-        append(new InfopointOp(stateFor(i.getState()), i.reason));
+        append(new InfopointOp(gen.stateFor(i.getState()), i.reason));
     }
 
     @Override
diff -r fbae9be45c95 -r a5373295d454 graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILNodeLIRGenerator.java
--- a/graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILNodeLIRGenerator.java	Wed Mar 26 20:44:11 2014 +0100
+++ b/graal/com.oracle.graal.compiler.hsail/src/com/oracle/graal/compiler/hsail/HSAILNodeLIRGenerator.java	Thu Mar 27 13:54:27 2014 +0100
@@ -72,7 +72,7 @@
         assert v.stamp() instanceof ObjectStamp;
         Variable obj = newVariable(Kind.Object);
         gen.emitMove(obj, operand(v));
-        append(new HSAILMove.NullCheckOp(obj, state(deopting)));
+        append(new HSAILMove.NullCheckOp(obj, gen.state(deopting)));
     }
 
     @Override
diff -r fbae9be45c95 -r a5373295d454 graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXNodeLIRGenerator.java
--- a/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXNodeLIRGenerator.java	Wed Mar 26 20:44:11 2014 +0100
+++ b/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXNodeLIRGenerator.java	Thu Mar 27 13:54:27 2014 +0100
@@ -185,7 +185,7 @@
     @Override
     public void emitNullCheck(ValueNode v, DeoptimizingNode deopting) {
         assert v.getKind() == Kind.Object;
-        append(new PTXMove.NullCheckOp(gen.load(operand(v)), state(deopting)));
+        append(new PTXMove.NullCheckOp(gen.load(operand(v)), gen.state(deopting)));
     }
 
     @Override
diff -r fbae9be45c95 -r a5373295d454 graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeLIRGenerator.java
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeLIRGenerator.java	Wed Mar 26 20:44:11 2014 +0100
+++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCNodeLIRGenerator.java	Thu Mar 27 13:54:27 2014 +0100
@@ -65,7 +65,7 @@
     @Override
     public void emitNullCheck(ValueNode v, DeoptimizingNode deopting) {
         assert v.getKind() == Kind.Object;
-        append(new NullCheckOp(gen.load(operand(v)), state(deopting)));
+        append(new NullCheckOp(gen.load(operand(v)), gen.state(deopting)));
     }
 
     @Override
diff -r fbae9be45c95 -r a5373295d454 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRGenerator.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRGenerator.java	Wed Mar 26 20:44:11 2014 +0100
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRGenerator.java	Thu Mar 27 13:54:27 2014 +0100
@@ -192,48 +192,6 @@
         return LabelRef.forSuccessor(res.getLIR(), (Block) gen.getCurrentBlock(), suxIndex);
     }
 
-    @Deprecated
-    private static FrameState getFrameState(DeoptimizingNode deopt) {
-        if (deopt instanceof DeoptimizingNode.DeoptBefore) {
-            return ((DeoptimizingNode.DeoptBefore) deopt).stateBefore();
-        } else if (deopt instanceof DeoptimizingNode.DeoptDuring) {
-            return ((DeoptimizingNode.DeoptDuring) deopt).stateDuring();
-        } else {
-            assert deopt instanceof DeoptimizingNode.DeoptAfter;
-            return ((DeoptimizingNode.DeoptAfter) deopt).stateAfter();
-        }
-    }
-
-    @Deprecated
-    public LIRFrameState state(DeoptimizingNode deopt) {
-        if (!deopt.canDeoptimize()) {
-            return null;
-        }
-        return stateFor(getFrameState(deopt));
-    }
-
-    @Deprecated
-    public LIRFrameState stateWithExceptionEdge(DeoptimizingNode deopt, LabelRef exceptionEdge) {
-        if (!deopt.canDeoptimize()) {
-            return null;
-        }
-        return stateForWithExceptionEdge(getFrameState(deopt), exceptionEdge);
-    }
-
-    @Deprecated
-    public LIRFrameState stateFor(FrameState state) {
-        return stateForWithExceptionEdge(state, null);
-    }
-
-    @Deprecated
-    public LIRFrameState stateForWithExceptionEdge(FrameState state, LabelRef exceptionEdge) {
-        if (gen.needOnlyOopMaps()) {
-            return new LIRFrameState(null, null, null);
-        }
-        assert state != null;
-        return getDebugInfoBuilder().build(state, exceptionEdge);
-    }
-
     public final void append(LIRInstruction op) {
         if (printIRWithLIR && !TTY.isSuppressed()) {
             if (currentInstruction != null && lastInstructionPrinted != currentInstruction) {
@@ -732,7 +690,7 @@
         if (x instanceof InvokeWithExceptionNode) {
             exceptionEdge = getLIRBlock(((InvokeWithExceptionNode) x).exceptionEdge());
         }
-        LIRFrameState callState = stateWithExceptionEdge(x, exceptionEdge);
+        LIRFrameState callState = gen.stateWithExceptionEdge(x, exceptionEdge);
 
         Value result = invokeCc.getReturn();
         if (callTarget instanceof DirectCallTargetNode) {
diff -r fbae9be45c95 -r a5373295d454 graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRGenerator.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRGenerator.java	Wed Mar 26 20:44:11 2014 +0100
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotNodeLIRGenerator.java	Thu Mar 27 13:54:27 2014 +0100
@@ -111,7 +111,7 @@
 
     @Override
     public void visitSafepointNode(SafepointNode i) {
-        LIRFrameState info = state(i);
+        LIRFrameState info = gen.state(i);
         append(new AMD64HotSpotSafepointOp(info, getGen().config, this));
     }
 
diff -r fbae9be45c95 -r a5373295d454 graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotNodeLIRGenerator.java
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotNodeLIRGenerator.java	Wed Mar 26 20:44:11 2014 +0100
+++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotNodeLIRGenerator.java	Thu Mar 27 13:54:27 2014 +0100
@@ -60,7 +60,7 @@
 
     @Override
     public void visitSafepointNode(SafepointNode i) {
-        LIRFrameState info = state(i);
+        LIRFrameState info = gen.state(i);
         append(new SPARCHotSpotSafepointOp(info, getGen().config, gen));
     }
 
diff -r fbae9be45c95 -r a5373295d454 graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Wed Mar 26 20:44:11 2014 +0100
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Thu Mar 27 13:54:27 2014 +0100
@@ -291,7 +291,7 @@
         /**
          * A hook for derived classes to modify the graph start instruction or append new
          * instructions to it.
-         * 
+         *
          * @param startInstr The start instruction of the graph.
          */
         protected void finishPrepare(FixedWithNextNode startInstr) {
@@ -316,6 +316,7 @@
             return stream.currentBCI();
         }
 
+        @SuppressWarnings("unused")
         private void loadLocal(int index, Kind kind) {
             frameState.push(kind, frameState.loadLocal(index));
         }
@@ -913,7 +914,7 @@
         /**
          * Gets the kind of array elements for the array type code that appears in a
          * {@link Bytecodes#NEWARRAY} bytecode.
-         * 
+         *
          * @param code the array type code
          * @return the kind from the array type code
          */
@@ -1320,7 +1321,7 @@
         /**
          * Helper function that sums up the probabilities of all keys that lead to a specific
          * successor.
-         * 
+         *
          * @return an array of size successorCount with the accumulated probability for each
          *         successor.
          */
@@ -1832,7 +1833,7 @@
 
         /**
          * A hook for derived classes to modify the last instruction or add other instructions.
-         * 
+         *
          * @param instr The last instruction (= fixed node) which was added.
          * @param state The current frame state.
          * @Returns Returns the (new) last instruction.