Mercurial > hg > truffle
changeset 4273:0519dc447740
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 11 Jan 2012 18:59:33 +0100 |
parents | 75c951399c65 (current diff) 3e5c18a41c25 (diff) |
children | 2d2b31b6feae |
files | |
diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 {
--- 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; + } }