# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1417643703 -3600
# Node ID 859ee5dad32cd905562fda343e34bcb0709c2d93
# Parent  252067cb86ad237d88f1d12826a06b81d20d0639
Pass StackSlotAllocator to FrameMapBuilder.buildFrameMap().

diff -r 252067cb86ad -r 859ee5dad32c graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java	Wed Dec 03 20:34:57 2014 +0100
+++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java	Wed Dec 03 22:55:03 2014 +0100
@@ -157,7 +157,7 @@
                 }
                 try (Scope s1 = Debug.scope("BuildFrameMap")) {
                     // build frame map
-                    lirGenRes.buildFrameMap();
+                    lirGenRes.buildFrameMap(new SimpleStackSlotAllocator());
                     Debug.dump(lir, "After FrameMap building");
                 }
                 try (Scope s1 = Debug.scope("MarkLocations")) {
diff -r 252067cb86ad -r 859ee5dad32c graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java	Wed Dec 03 20:34:57 2014 +0100
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java	Wed Dec 03 22:55:03 2014 +0100
@@ -357,7 +357,7 @@
 
             try (Scope s1 = Debug.scope("BuildFrameMap")) {
                 // build frame map
-                lirGenRes.buildFrameMap();
+                lirGenRes.buildFrameMap(new SimpleStackSlotAllocator());
                 Debug.dump(lir, "After FrameMap building");
             }
             try (Scope s1 = Debug.scope("MarkLocations")) {
diff -r 252067cb86ad -r 859ee5dad32c graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilder.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilder.java	Wed Dec 03 20:34:57 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilder.java	Wed Dec 03 22:55:03 2014 +0100
@@ -75,5 +75,5 @@
      * Creates a {@linkplain FrameMap} based on the information collected by this
      * {@linkplain FrameMapBuilder}.
      */
-    FrameMap buildFrameMap(LIRGenerationResult result);
+    FrameMap buildFrameMap(LIRGenerationResult result, StackSlotAllocator allocator);
 }
diff -r 252067cb86ad -r 859ee5dad32c graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java	Wed Dec 03 20:34:57 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/FrameMapBuilderImpl.java	Wed Dec 03 22:55:03 2014 +0100
@@ -89,8 +89,8 @@
         calls.add(cc);
     }
 
-    public FrameMap buildFrameMap(LIRGenerationResult res) {
-        new SimpleStackSlotAllocator().allocateStackSlots(this, res);
+    public FrameMap buildFrameMap(LIRGenerationResult res, StackSlotAllocator allocator) {
+        allocator.allocateStackSlots(this, res);
         for (CallingConvention cc : calls) {
             frameMap.callsMethod(cc);
         }
diff -r 252067cb86ad -r 859ee5dad32c graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResult.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResult.java	Wed Dec 03 20:34:57 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResult.java	Wed Dec 03 22:55:03 2014 +0100
@@ -31,7 +31,7 @@
      * Returns the {@link FrameMapBuilder} for collecting the information to build a
      * {@link FrameMap}.
      *
-     * This method can only be used prior calling {@link #buildFrameMap()}.
+     * This method can only be used prior calling {@link #buildFrameMap}.
      */
     FrameMapBuilder getFrameMapBuilder();
 
@@ -41,12 +41,12 @@
      *
      * @see FrameMapBuilder#buildFrameMap
      */
-    void buildFrameMap();
+    void buildFrameMap(StackSlotAllocator allocator);
 
     /**
      * Returns the {@link FrameMap} associated with this {@link LIRGenerationResult}.
      *
-     * This method can only be called after {@link #buildFrameMap()}.
+     * This method can only be called after {@link #buildFrameMap}.
      */
     FrameMap getFrameMap();
 
diff -r 252067cb86ad -r 859ee5dad32c graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java	Wed Dec 03 20:34:57 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java	Wed Dec 03 22:55:03 2014 +0100
@@ -59,9 +59,9 @@
         return frameMapBuilder;
     }
 
-    public void buildFrameMap() {
+    public void buildFrameMap(StackSlotAllocator allocator) {
         assert frameMap == null : "buildFrameMap() can only be called once!";
-        frameMap = frameMapBuilder.buildFrameMap(this);
+        frameMap = frameMapBuilder.buildFrameMap(this, allocator);
     }
 
     public FrameMap getFrameMap() {