Mercurial > hg > truffle

changeset 14896:89be1673acd8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BytecodeParseHelper initialize members.
author Josef Eisl <josef.eisl@jku.at>
date Mon, 24 Mar 2014 20:05:51 +0100
parents d76fce67b49d
children 427576411fd7
files graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineCompiler.java graal/com.oracle.graal.java/src/com/oracle/graal/java/BytecodeParseHelper.java
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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<Value> {
 
-        public BytecodeParser(MetaAccessProvider metaAccess, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, AbstractFrameStateBuilder<Value> frameState) {
-            super(metaAccess, graphBuilderConfig, optimisticOpts, frameState);
+        public BytecodeParser(MetaAccessProvider metaAccess, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, AbstractFrameStateBuilder<Value> frameState,
+                        BytecodeStream stream, ProfilingInfo profilingInfo, ConstantPool constantPool) {
+            super(metaAccess, graphBuilderConfig, optimisticOpts, frameState, stream, profilingInfo, constantPool);
         }
 
         @Override
--- 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<T> frameState) {
+    public BytecodeParseHelper(MetaAccessProvider metaAccess, GraphBuilderConfiguration graphBuilderConfig, OptimisticOptimizations optimisticOpts, AbstractFrameStateBuilder<T> 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;
     }