# HG changeset patch # User Josef Eisl # Date 1395687951 -3600 # Node ID 89be1673acd827182644e62cbdefef6bc2f1e300 # Parent d76fce67b49d8cf1518920f7bee85ba67071395b BytecodeParseHelper initialize members. diff -r d76fce67b49d -r 89be1673acd8 graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java --- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java Mon Mar 24 19:24:59 2014 +0100 +++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java Mon Mar 24 20:05:51 2014 +0100 @@ -110,7 +110,7 @@ frameState = new LIRFrameStateBuilder(method); OptimisticOptimizations optimisticOpts = OptimisticOptimizations.NONE; - parserHelper = new BytecodeParser(metaAccess, graphBuilderConfig, optimisticOpts, frameState); + parserHelper = new BytecodeParser(metaAccess, graphBuilderConfig, optimisticOpts, frameState, stream, profilingInfo, constantPool); // build blocks and LIR instructions try { @@ -276,8 +276,9 @@ private class BytecodeParser extends BytecodeParseHelper { - public BytecodeParser(MetaAccessProvider metaAccess, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, AbstractFrameStateBuilder frameState) { - super(metaAccess, graphBuilderConfig, optimisticOpts, frameState); + public BytecodeParser(MetaAccessProvider metaAccess, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, AbstractFrameStateBuilder frameState, + BytecodeStream stream, ProfilingInfo profilingInfo, ConstantPool constantPool) { + super(metaAccess, graphBuilderConfig, optimisticOpts, frameState, stream, profilingInfo, constantPool); } @Override diff -r d76fce67b49d -r 89be1673acd8 graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParseHelper.java --- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParseHelper.java Mon Mar 24 19:24:59 2014 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParseHelper.java Mon Mar 24 20:05:51 2014 +0100 @@ -33,11 +33,16 @@ private final MetaAccessProvider metaAccess; private int entryBCI; - public BytecodeParseHelper(MetaAccessProvider metaAccess, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, AbstractFrameStateBuilder frameState) { + public BytecodeParseHelper(MetaAccessProvider metaAccess, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, AbstractFrameStateBuilder frameState, + BytecodeStream stream, ProfilingInfo profilingInfo, ConstantPool constantPool) { this.frameState = frameState; this.graphBuilderConfig = graphBuilderConfig; this.optimisticOpts = optimisticOpts; this.metaAccess = metaAccess; + this.stream = stream; + this.profilingInfo = profilingInfo; + this.constantPool = constantPool; + this.entryBCI = stream.currentBCI(); assert metaAccess != null; }