# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1417700335 -3600
# Node ID 56c6eb8f52612addee026baf052ec67fff357569
# Parent  b0fabf67614a47a36aea169030f5b1bbe6c6f971
Rename LIRFrameState.markLocation(ReferenceMap) to updateUnion(ReferenceMap).

diff -r b0fabf67614a -r 56c6eb8f5261 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LocationMarker.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LocationMarker.java	Thu Dec 04 14:39:27 2014 +0100
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LocationMarker.java	Thu Dec 04 14:38:55 2014 +0100
@@ -203,7 +203,7 @@
         if (!info.hasDebugInfo()) {
             info.initDebugInfo(frameMap, !op.destroysCallerSavedRegisters() || !frameMap.getRegisterConfig().areAllAllocatableRegistersCallerSaved());
         }
-        info.markLocation(refMap);
+        info.updateUnion(refMap);
     }
 
     /**
diff -r b0fabf67614a -r 56c6eb8f5261 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	Thu Dec 04 14:39:27 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java	Thu Dec 04 14:38:55 2014 +0100
@@ -133,7 +133,10 @@
         frameMap.setReference(location, debugInfo.getReferenceMap());
     }
 
-    public void markLocation(ReferenceMap refMap) {
+    /**
+     * Updates this reference map with all references that are marked in {@code refMap}.
+     */
+    public void updateUnion(ReferenceMap refMap) {
         debugInfo.getReferenceMap().updateUnion(refMap);
     }