Mercurial > hg > truffle

changeset 18617:56c6eb8f5261

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename LIRFrameState.markLocation(ReferenceMap) to updateUnion(ReferenceMap).
author Josef Eisl <josef.eisl@jku.at>
date Thu, 04 Dec 2014 14:38:55 +0100
parents b0fabf67614a
children 965f1e08c083
files graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/LocationMarker.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRFrameState.java
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);
     }
 
     /**
--- 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);
     }