# HG changeset patch # User Josef Eisl # Date 1423487943 -3600 # Node ID e20a4aab49ad31ae921624b4e1e966c1f010f601 # Parent 0ea5aa5f6b2e59a1c4996ed134ede1e1c7a33043 GraalCompiler.emitLowLevel: pass LowLevelCompilerConfiguration as parameter. diff -r 0ea5aa5f6b2e -r e20a4aab49ad graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java --- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java Mon Feb 09 13:39:11 2015 +0100 +++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java Mon Feb 09 14:19:03 2015 +0100 @@ -43,6 +43,7 @@ import com.oracle.graal.lir.StandardOp.BlockEndOp; import com.oracle.graal.lir.framemap.*; import com.oracle.graal.lir.gen.*; +import com.oracle.graal.lir.phases.*; import com.oracle.graal.phases.*; public class BaselineBytecodeParser extends AbstractBytecodeParser implements BytecodeParserTool { @@ -145,7 +146,8 @@ } try (Scope s = Debug.scope("LowLevelTier", this)) { - return GraalCompiler.emitLowLevel(backend, target, codeEmittingOrder, linearScanOrder, lirGenRes, gen); + LowLevelCompilerConfiguration config = backend.getLowLevelCompilerConfiguration(); + return GraalCompiler.emitLowLevel(target, codeEmittingOrder, linearScanOrder, lirGenRes, gen, config); } catch (Throwable e) { throw Debug.handle(e); } diff -r 0ea5aa5f6b2e -r e20a4aab49ad graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Mon Feb 09 13:39:11 2015 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Mon Feb 09 14:19:03 2015 +0100 @@ -335,7 +335,8 @@ } try (Scope s = Debug.scope("LowLevelTier", nodeLirGen)) { - return emitLowLevel(backend, target, codeEmittingOrder, linearScanOrder, lirGenRes, lirGen); + LowLevelCompilerConfiguration config = backend.getLowLevelCompilerConfiguration(); + return emitLowLevel(target, codeEmittingOrder, linearScanOrder, lirGenRes, lirGen, config); } catch (Throwable e) { throw Debug.handle(e); } @@ -344,9 +345,8 @@ } } - public static > LIRGenerationResult emitLowLevel(Backend backend, TargetDescription target, List codeEmittingOrder, List linearScanOrder, - LIRGenerationResult lirGenRes, LIRGeneratorTool lirGen) { - LowLevelCompilerConfiguration config = backend.getLowLevelCompilerConfiguration(); + public static > LIRGenerationResult emitLowLevel(TargetDescription target, List codeEmittingOrder, List linearScanOrder, LIRGenerationResult lirGenRes, + LIRGeneratorTool lirGen, LowLevelCompilerConfiguration config) { try (Scope s0 = Debug.scope("LowLevelHighTier")) { LowLevelHighTierPhase.Context c = new LowLevelHighTierPhase.Context(lirGen); config. createHighTier().apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, c);