# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1425337296 -3600
# Node ID c96f8337292e9ad4fc22697f8be18c2c3b6f1fef
# Parent  e17923568367d56e5289a262665c74a8d02160f2# Parent  0a6b0e662e0a28076fd55b9c77ce0fd9f8c3e722
Merge.

diff -r e17923568367 -r c96f8337292e 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	Mon Mar 02 19:09:46 2015 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java	Tue Mar 03 00:01:36 2015 +0100
@@ -112,7 +112,7 @@
     }
 
     /**
-     * Called by the register allocator before {@link #markLocation} to initialize the frame state.
+     * Called by the register allocator before {@link #updateUnion} to initialize the frame state.
      *
      * @param frameMap The frame map.
      * @param canHaveRegisters True if there can be any register map entries.
@@ -122,18 +122,6 @@
     }
 
     /**
-     * Called by the register allocator to mark the specified location as a reference in the
-     * reference map of the debug information. The tracked location can be a {@link RegisterValue}
-     * or a {@link StackSlot}. Note that a {@link JavaConstant} is automatically tracked.
-     *
-     * @param location The location to be added to the reference map.
-     * @param frameMap The frame map.
-     */
-    public void markLocation(Value location, FrameMap frameMap) {
-        frameMap.setReference(location, debugInfo.getReferenceMap());
-    }
-
-    /**
      * Updates this reference map with all references that are marked in {@code refMap}.
      */
     public void updateUnion(ReferenceMap refMap) {