--- a/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java	Tue May 24 14:40:47 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java	Tue May 24 21:39:45 2011 +0200
@@ -392,8 +392,8 @@
 
         // emit phi-instruction moves after safepoint since this simplifies
         // describing the state at the safepoint.
-        moveToPhi(x.stateAfter());
 
+        moveToPhi();
         lir.jump(getLIRBlock(x.defaultSuccessor()));
     }
 
@@ -1266,11 +1266,6 @@
         }
     }
 
-    protected void moveToPhi() {
-        assert lastState != null;
-        this.moveToPhi(lastState);
-    }
-
     private List<Phi> getPhis(LIRBlock block) {
         if (block.getInstructions().size() > 0) {
             Instruction i = block.getInstructions().get(0);
@@ -1287,7 +1282,7 @@
         return null;
     }
 
-    protected void moveToPhi(FrameState curState) {
+    protected void moveToPhi() {
         // Moves all stack values into their phi position
         LIRBlock bb = currentBlock;
         if (bb.numberOfSux() == 1) {