Mercurial > hg > graal-compiler

changeset 14811:73a77e65c805

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Resolve BaselineCompiler LIRGenerationResult issues.
author Josef Eisl <josef.eisl@jku.at>
date Tue, 18 Mar 2014 14:50:17 +0100
parents eab93bf521d7
children 20dcae7f93eb
files graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java	Tue Mar 18 14:48:39 2014 +0100
+++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java	Tue Mar 18 14:50:17 2014 +0100
@@ -117,7 +117,8 @@
         List<? extends AbstractBlock<?>> codeEmittingOrder = ComputeBlockOrder.computeCodeEmittingOrder(blocks.length, b, blockProbabilities);
         LIR lir = new LIR(cfg, linearScanOrder, codeEmittingOrder);
         CallingConvention cc = CodeUtil.getCallingConvention(backend.getProviders().getCodeCache(), CallingConvention.Type.JavaCallee, method, false);
-        LIRGenerator lirGen = backend.newLIRGenerator(null, null, backend.newFrameMap(), cc, lir);
+        LIRGenerationResult lirGenRes = backend.newLIRGenerationResult(lir, backend.newFrameMap(), null);
+        LIRGenerator lirGen = backend.newLIRGenerator(null, cc, lirGenRes);
 
         // add instruction
         lirGen.emitAdd(Constant.forLong(42), Constant.forLong(73));
@@ -126,11 +127,11 @@
         lir.setLIRforBlock(b, lirList);
 
         // register allocation
-        lirGen.getFrameMap().finish();
+        lirGenRes.getFrameMap().finish();
 
         // emitCode
         Assumptions assumptions = new Assumptions(OptAssumptions.getValue());
-        GraalCompiler.emitCode(backend, assumptions, lirGen, compilationResult, installedCodeOwner, factory);
+        GraalCompiler.emitCode(backend, assumptions, lirGenRes, compilationResult, installedCodeOwner, factory);
 
         return compilationResult;
     }