Mercurial > hg > graal-compiler

changeset 18444:db9dd1265e61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
AMD64HotSpotLIRGenerationResult does not need to be FrameMappable.
author Josef Eisl <josef.eisl@jku.at>
date Mon, 17 Nov 2014 17:22:54 +0100
parents 1c92d437179b
children 509dc57b0802
files graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerationResult.java
diffstat 1 files changed, 6 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerationResult.java	Mon Nov 17 16:41:44 2014 +0100
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerationResult.java	Mon Nov 17 17:22:54 2014 +0100
@@ -22,25 +22,23 @@
  */
 package com.oracle.graal.hotspot.amd64;
 
-import static com.oracle.graal.api.code.ValueUtil.*;
-
 import java.util.*;
 
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.hotspot.stubs.*;
 import com.oracle.graal.lir.*;
-import com.oracle.graal.lir.FrameMapBuilder.FrameMappingTool;
 import com.oracle.graal.lir.StandardOp.SaveRegistersOp;
+import com.oracle.graal.lir.framemap.*;
 import com.oracle.graal.lir.gen.*;
 
-public class AMD64HotSpotLIRGenerationResult extends LIRGenerationResultBase implements FrameMapBuilder.FrameMappable {
+public class AMD64HotSpotLIRGenerationResult extends LIRGenerationResultBase {
 
     /**
      * The slot reserved for storing the original return address when a frame is marked for
      * deoptimization. The return address slot in the callee is overwritten with the address of a
      * deoptimization stub.
      */
-    private StackSlotValue deoptimizationRescueSlot;
+    private StackSlot deoptimizationRescueSlot;
     private final Object stub;
 
     /**
@@ -58,11 +56,10 @@
         if (deoptimizationRescueSlot == null) {
             return null;
         }
-        assert isStackSlot(deoptimizationRescueSlot);
-        return asStackSlot(deoptimizationRescueSlot);
+        return deoptimizationRescueSlot;
     }
 
-    public final void setDeoptimizationRescueSlot(StackSlotValue stackSlot) {
+    public final void setDeoptimizationRescueSlot(StackSlot stackSlot) {
         this.deoptimizationRescueSlot = stackSlot;
     }
 
@@ -73,8 +70,4 @@
     Map<LIRFrameState, SaveRegistersOp> getCalleeSaveInfo() {
         return calleeSaveInfo;
     }
-
-    public void map(FrameMappingTool tool) {
-        deoptimizationRescueSlot = tool.getStackSlot(asVirtualStackSlot(deoptimizationRescueSlot));
-    }
-}
+}
\ No newline at end of file