# HG changeset patch
# User Stefan Anzinger <stefan.anzinger@oracle.com>
# Date 1425395435 -3600
# Node ID 787e9bd5966e2ef3fc1d5b2cbb5b49be15c989d7
# Parent  84b85c43633b79757be140cf81401dc856c7f04e# Parent  7e429c4c3bfc82c4c32d2978c953f4d6f8f1af1a
Merge

diff -r 84b85c43633b -r 787e9bd5966e graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java	Tue Mar 03 16:10:07 2015 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java	Tue Mar 03 16:10:35 2015 +0100
@@ -140,15 +140,6 @@
         debugInfo.getReferenceMap().updateUnion(refMap);
     }
 
-    /**
-     * Called by the register allocator after all locations are marked.
-     *
-     * @param op The instruction to which this frame state belongs.
-     * @param frameMap The frame map.
-     */
-    public void finish(LIRInstruction op, FrameMap frameMap) {
-    }
-
     @Override
     public String toString() {
         return debugInfo != null ? debugInfo.toString() : topFrame != null ? topFrame.toString() : "<empty>";
diff -r 84b85c43633b -r 787e9bd5966e graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LocationMarker.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LocationMarker.java	Tue Mar 03 16:10:07 2015 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LocationMarker.java	Tue Mar 03 16:10:35 2015 +0100
@@ -84,15 +84,6 @@
                 AbstractBlockBase<?> block = worklist.poll();
                 processBlock(block, worklist);
             }
-            // finish states
-            for (AbstractBlockBase<?> block : lir.getControlFlowGraph().getBlocks()) {
-                List<LIRInstruction> instructions = lir.getLIRforBlock(block);
-                for (int i = instructions.size() - 1; i >= 0; i--) {
-                    LIRInstruction inst = instructions.get(i);
-                    inst.forEachState((op, info) -> info.finish(op, frameMap));
-                }
-
-            }
         }
 
         /**
diff -r 84b85c43633b -r 787e9bd5966e graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/AllocationStage.java