# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1416250858 -3600
# Node ID 6c7efa29b626adbc464456a00b85adbf6912a130
# Parent  c7fd88183eef09faa1bd6e442106803ee68cfe24
DelayedFrameMapBuilder: remove FrameMapFactory.

diff -r c7fd88183eef -r 6c7efa29b626 graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Mon Nov 17 19:54:33 2014 +0100
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Mon Nov 17 20:00:58 2014 +0100
@@ -68,7 +68,7 @@
 
     @Override
     public FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
-        return new AMD64FrameMapBuilder(this::newFrameMap, getCodeCache(), registerConfig);
+        return new AMD64FrameMapBuilder(newFrameMap(registerConfig), getCodeCache(), registerConfig);
     }
 
     @Override
diff -r c7fd88183eef -r 6c7efa29b626 graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java	Mon Nov 17 19:54:33 2014 +0100
+++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java	Mon Nov 17 20:00:58 2014 +0100
@@ -387,7 +387,7 @@
 
     @Override
     public FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
-        return new DelayedFrameMapBuilder(this::newFrameMap, getCodeCache(), registerConfig);
+        return new DelayedFrameMapBuilder(newFrameMap(registerConfig), getCodeCache(), registerConfig);
     }
 
     /**
diff -r c7fd88183eef -r 6c7efa29b626 graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java
--- a/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java	Mon Nov 17 19:54:33 2014 +0100
+++ b/graal/com.oracle.graal.hotspot.ptx/src/com/oracle/graal/hotspot/ptx/PTXHotSpotBackend.java	Mon Nov 17 20:00:58 2014 +0100
@@ -158,7 +158,7 @@
 
     @Override
     public FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
-        return new DelayedFrameMapBuilder(this::newFrameMap, getCodeCache(), registerConfig);
+        return new DelayedFrameMapBuilder(newFrameMap(registerConfig), getCodeCache(), registerConfig);
     }
 
     @Override
diff -r c7fd88183eef -r 6c7efa29b626 graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java	Mon Nov 17 19:54:33 2014 +0100
+++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java	Mon Nov 17 20:00:58 2014 +0100
@@ -74,7 +74,7 @@
 
     @Override
     public FrameMapBuilder newFrameMapBuilder(RegisterConfig registerConfig) {
-        return new DelayedFrameMapBuilder(this::newFrameMap, getCodeCache(), registerConfig);
+        return new DelayedFrameMapBuilder(newFrameMap(registerConfig), getCodeCache(), registerConfig);
     }
 
     @Override
diff -r c7fd88183eef -r 6c7efa29b626 graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMapBuilder.java
--- a/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMapBuilder.java	Mon Nov 17 19:54:33 2014 +0100
+++ b/graal/com.oracle.graal.lir.amd64/src/com/oracle/graal/lir/amd64/AMD64FrameMapBuilder.java	Mon Nov 17 20:00:58 2014 +0100
@@ -27,8 +27,8 @@
 
 public class AMD64FrameMapBuilder extends DelayedFrameMapBuilder {
 
-    public AMD64FrameMapBuilder(FrameMapFactory factory, CodeCacheProvider codeCache, RegisterConfig registerConfig) {
-        super(factory, codeCache, registerConfig);
+    public AMD64FrameMapBuilder(FrameMap frameMap, CodeCacheProvider codeCache, RegisterConfig registerConfig) {
+        super(frameMap, codeCache, registerConfig);
     }
 
     /**
diff -r c7fd88183eef -r 6c7efa29b626 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:54:33 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/framemap/DelayedFrameMapBuilder.java	Mon Nov 17 20:00:58 2014 +0100
@@ -34,21 +34,16 @@
  */
 public class DelayedFrameMapBuilder implements FrameMapBuilder {
 
-    @FunctionalInterface
-    public interface FrameMapFactory {
-        FrameMap newFrameMap(RegisterConfig registerConfig);
-    }
-
     private final RegisterConfig registerConfig;
     private final CodeCacheProvider codeCache;
     protected final FrameMap frameMap;
     private final List<VirtualStackSlot> stackSlots;
     private final List<CallingConvention> calls;
 
-    public DelayedFrameMapBuilder(FrameMapFactory factory, CodeCacheProvider codeCache, RegisterConfig registerConfig) {
+    public DelayedFrameMapBuilder(FrameMap frameMap, CodeCacheProvider codeCache, RegisterConfig registerConfig) {
         this.registerConfig = registerConfig == null ? codeCache.getRegisterConfig() : registerConfig;
         this.codeCache = codeCache;
-        this.frameMap = factory.newFrameMap(registerConfig);
+        this.frameMap = frameMap;
         this.stackSlots = new ArrayList<>();
         this.calls = new ArrayList<>();
         this.mappables = new ArrayList<>();