Mercurial > hg > truffle
changeset 18454:5af19da6fae5
DelayedFrameMapBuilder: remove TrackedVirtualStackSlot.
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Mon, 17 Nov 2014 19:34:08 +0100 |
parents | e3376d3e3160 |
children | ceacdac8b8b9 |
files | graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/DelayedFrameMapBuilder.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMappingToolImpl.java |
diffstat | 2 files changed, 5 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/DelayedFrameMapBuilder.java Mon Nov 17 19:32:55 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/DelayedFrameMapBuilder.java Mon Nov 17 19:34:08 2014 +0100 @@ -42,7 +42,7 @@ private final RegisterConfig registerConfig; private final CodeCacheProvider codeCache; protected final FrameMap frameMap; - private final List<TrackedVirtualStackSlot> stackSlots; + private final List<VirtualStackSlot> stackSlots; private final List<CallingConvention> calls; public DelayedFrameMapBuilder(FrameMapFactory factory, CodeCacheProvider codeCache, RegisterConfig registerConfig) { @@ -62,18 +62,7 @@ return slot; } - abstract class TrackedVirtualStackSlot extends VirtualStackSlot { - /** - * - */ - private static final long serialVersionUID = 408446797222290182L; - - public TrackedVirtualStackSlot(LIRKind lirKind) { - super(lirKind); - } - } - - class SimpleVirtualStackSlot extends TrackedVirtualStackSlot { + static class SimpleVirtualStackSlot extends VirtualStackSlot { private static final long serialVersionUID = 7654295701165421750L; @@ -83,7 +72,7 @@ } - class VirtualStackSlotRange extends TrackedVirtualStackSlot { + static class VirtualStackSlotRange extends VirtualStackSlot { private static final long serialVersionUID = 5152592950118317121L; private final BitSet objects; @@ -148,7 +137,7 @@ this.mappables.add(mappable); } - List<TrackedVirtualStackSlot> getStackSlots() { + List<VirtualStackSlot> getStackSlots() { return stackSlots; }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMappingToolImpl.java Mon Nov 17 19:32:55 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMappingToolImpl.java Mon Nov 17 19:34:08 2014 +0100 @@ -27,7 +27,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.compiler.common.*; import com.oracle.graal.lir.framemap.DelayedFrameMapBuilder.SimpleVirtualStackSlot; -import com.oracle.graal.lir.framemap.DelayedFrameMapBuilder.TrackedVirtualStackSlot; import com.oracle.graal.lir.framemap.DelayedFrameMapBuilder.VirtualStackSlotRange; public class FrameMappingToolImpl implements FrameMappingTool { @@ -45,7 +44,7 @@ } public void mapStackSlots() { - for (TrackedVirtualStackSlot virtualSlot : builder.getStackSlots()) { + for (VirtualStackSlot virtualSlot : builder.getStackSlots()) { final StackSlot slot; if (virtualSlot instanceof SimpleVirtualStackSlot) { slot = mapSimpleVirtualStackSlot((SimpleVirtualStackSlot) virtualSlot);