# HG changeset patch # User Josef Eisl # Date 1416250473 -3600 # Node ID c7fd88183eef09faa1bd6e442106803ee68cfe24 # Parent ceacdac8b8b97568b67cede2144c9b29d851303e FrameMappingToolImpl: store mapping internally. diff -r ceacdac8b8b9 -r c7fd88183eef 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:36:52 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/DelayedFrameMapBuilder.java Mon Nov 17 19:54:33 2014 +0100 @@ -87,9 +87,7 @@ } public FrameMap buildFrameMap(LIRGenerationResult res) { - HashMap mapping = new HashMap<>(); - // fill - FrameMappingToolImpl tool = new FrameMappingToolImpl(mapping, this); + FrameMappingToolImpl tool = new FrameMappingToolImpl(this); tool.mapStackSlots(); for (CallingConvention cc : calls) { frameMap.callsMethod(cc); diff -r ceacdac8b8b9 -r c7fd88183eef 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:36:52 2014 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMappingToolImpl.java Mon Nov 17 19:54:33 2014 +0100 @@ -29,11 +29,11 @@ public class FrameMappingToolImpl implements FrameMappingTool { - private final Map mapping; + private final HashMap mapping; private final DelayedFrameMapBuilder builder; - public FrameMappingToolImpl(Map mapping, DelayedFrameMapBuilder builder) { - this.mapping = mapping; + public FrameMappingToolImpl(DelayedFrameMapBuilder builder) { + this.mapping = new HashMap<>(); this.builder = builder; } @@ -41,7 +41,7 @@ return mapping.get(slot); } - public void mapStackSlots() { + void mapStackSlots() { for (VirtualStackSlot virtualSlot : builder.getStackSlots()) { final StackSlot slot; if (virtualSlot instanceof SimpleVirtualStackSlot) {