# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1326304773 -3600
# Node ID 0519dc44774016b408efb7dbae75116932a9caba
# Parent  75c951399c658ad7dbb94e5c53208e5344c064fc# Parent  3e5c18a41c252205eaf4cbc1224341cae5ef374a
Merge.

diff -r 75c951399c65 -r 0519dc447740 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java	Wed Jan 11 18:25:56 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalCompiler.java	Wed Jan 11 18:59:33 2012 +0100
@@ -76,6 +76,10 @@
     }
 
     public CiTargetMethod compileMethod(RiResolvedMethod method, int osrBCI, PhasePlan plan) {
+        return compileMethod(method, new StructuredGraph(method), osrBCI, plan);
+    }
+
+    public CiTargetMethod compileMethod(RiResolvedMethod method, StructuredGraph graph, int osrBCI, PhasePlan plan) {
         if (osrBCI != -1) {
             throw new CiBailout("No OSR supported");
         }
@@ -94,7 +98,6 @@
             }
             TTY.Filter filter = new TTY.Filter(GraalOptions.PrintFilter, method);
 
-            StructuredGraph graph = new StructuredGraph(method);
             CiTargetMethod result = null;
             context.observable.fireCompilationStarted(runtime, target, method);
             try {
diff -r 75c951399c65 -r 0519dc447740 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/LIRGenerator.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/LIRGenerator.java	Wed Jan 11 18:25:56 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/LIRGenerator.java	Wed Jan 11 18:59:33 2012 +0100
@@ -1486,4 +1486,8 @@
             return "XirSupport<" + current + ">";
         }
     }
+
+    public FrameMap frameMap() {
+        return frameMap;
+    }
 }