# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1416249125 -3600
# Node ID 94b184d89f11754d0a29df01fe63cd644834f4cd
# Parent  8538ef2ce729dca1db0c3c5cc5bbdf189fbb94d4
FrameMappingToolImpl: inline TrackedVirtualStackSlot.transform().

diff -r 8538ef2ce729 -r 94b184d89f11 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/DelayedFrameMapBuilder.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/DelayedFrameMapBuilder.java	Mon Nov 17 19:27:32 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/DelayedFrameMapBuilder.java	Mon Nov 17 19:32:05 2014 +0100
@@ -104,7 +104,15 @@
 
         @Override
         public StackSlot transform() {
-            return frameMap.allocateStackSlots(slots, objects);
+            return frameMap.allocateStackSlots(getSlots(), getObjects());
+        }
+
+        public int getSlots() {
+            return slots;
+        }
+
+        public BitSet getObjects() {
+            return (BitSet) objects.clone();
         }
 
     }
diff -r 8538ef2ce729 -r 94b184d89f11 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMappingToolImpl.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMappingToolImpl.java	Mon Nov 17 19:27:32 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMappingToolImpl.java	Mon Nov 17 19:32:05 2014 +0100
@@ -59,10 +59,10 @@
     }
 
     protected StackSlot mapSimpleVirtualStackSlot(SimpleVirtualStackSlot virtualStackSlot) {
-        return virtualStackSlot.transform();
+        return builder.frameMap.allocateSpillSlot(virtualStackSlot.getLIRKind());
     }
 
     protected StackSlot mapVirtualStackSlotRange(VirtualStackSlotRange virtualStackSlot) {
-        return virtualStackSlot.transform();
+        return builder.frameMap.allocateStackSlots(virtualStackSlot.getSlots(), virtualStackSlot.getObjects());
     }
 }