Mercurial > hg > truffle

changeset 18423:c656c5772cfa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pass LIRGenerationResult to FrameMapBuilder.buildFrameMap().
author Josef Eisl <josef.eisl@jku.at>
date Thu, 23 Oct 2014 13:13:16 +0200
parents a06ab51f9196
children 5afaa02c53dd
files graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ForwardingFrameMapBuilder.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMapBuilder.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResult.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java
diffstat 4 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ForwardingFrameMapBuilder.java	Mon Nov 10 18:23:51 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ForwardingFrameMapBuilder.java	Thu Oct 23 13:13:16 2014 +0200
@@ -26,6 +26,7 @@
 
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
+import com.oracle.graal.lir.gen.*;
 
 /**
  * A simple forwarder to {@link FrameMap}.
@@ -72,7 +73,7 @@
         frameMap.callsMethod(cc);
     }
 
-    public FrameMap buildFrameMap() {
+    public FrameMap buildFrameMap(LIRGenerationResult res) {
         frameMap.finish();
         return frameMap;
     }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMapBuilder.java	Mon Nov 10 18:23:51 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/FrameMapBuilder.java	Thu Oct 23 13:13:16 2014 +0200
@@ -26,10 +26,11 @@
 
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
+import com.oracle.graal.lir.gen.*;
 
 /**
  * A {@link FrameMapBuilder} is used to collect all information necessary to
- * {@linkplain #buildFrameMap() create} a {@link FrameMap}.
+ * {@linkplain #buildFrameMap create} a {@link FrameMap}.
  */
 public interface FrameMapBuilder {
 
@@ -80,5 +81,5 @@
      * Creates a {@linkplain FrameMap} based on the information collected by this
      * {@linkplain FrameMapBuilder}.
      */
-    FrameMap buildFrameMap();
+    FrameMap buildFrameMap(LIRGenerationResult result);
 }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResult.java	Mon Nov 10 18:23:51 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResult.java	Thu Oct 23 13:13:16 2014 +0200
@@ -38,7 +38,7 @@
      * Creates a {@link FrameMap} out of the {@link FrameMapBuilder}. This method should only be
      * called once. After calling it, {@link #getFrameMapBuilder()} can no longer be used.
      *
-     * @see FrameMapBuilder#buildFrameMap()
+     * @see FrameMapBuilder#buildFrameMap
      */
     void buildFrameMap();
 
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java	Mon Nov 10 18:23:51 2014 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerationResultBase.java	Thu Oct 23 13:13:16 2014 +0200
@@ -60,7 +60,7 @@
 
     public void buildFrameMap() {
         assert frameMap == null : "buildFrameMap() can only be called once!";
-        frameMap = frameMapBuilder.buildFrameMap();
+        frameMap = frameMapBuilder.buildFrameMap(this);
     }
 
     public FrameMap getFrameMap() {