Mercurial > hg > truffle

changeset 15027:0ab4e4a0e4bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
AbstractBytecodeParser: fix usage of AbstractFrameStateBuilder.
author Josef Eisl <josef.eisl@jku.at>
date Mon, 07 Apr 2014 16:13:53 +0200
parents d0294fa66a33
children 7ee9decb2784
files graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
diffstat 3 files changed, 9 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java	Mon Apr 07 15:43:00 2014 +0200
+++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java	Mon Apr 07 16:13:53 2014 +0200
@@ -571,13 +571,13 @@
     }
 
     @Override
-    protected Value createTarget(BciBlock trueBlock, AbstractFrameStateBuilder<Value> state) {
+    protected Value createTarget(BciBlock trueBlock, LIRFrameStateBuilder state) {
         // TODO Auto-generated method stub
         throw GraalInternalError.unimplemented("Auto-generated method stub");
     }
 
     @Override
-    protected Value createBlockTarget(double probability, BciBlock bciBlock, AbstractFrameStateBuilder<Value> stateAfter) {
+    protected Value createBlockTarget(double probability, BciBlock bciBlock, LIRFrameStateBuilder stateAfter) {
         // TODO Auto-generated method stub
         throw GraalInternalError.unimplemented("Auto-generated method stub");
     }
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java	Mon Apr 07 15:43:00 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java	Mon Apr 07 16:13:53 2014 +0200
@@ -910,7 +910,7 @@
 
     protected abstract T genDeoptimization();
 
-    protected T createTarget(double probability, BciBlock block, AbstractFrameStateBuilder<T> stateAfter) {
+    protected T createTarget(double probability, BciBlock block, F stateAfter) {
         assert probability >= 0 && probability <= 1.01 : probability;
         if (isNeverExecutedCode(probability)) {
             return genDeoptimization();
@@ -920,13 +920,13 @@
         }
     }
 
-    protected abstract T createTarget(BciBlock trueBlock, AbstractFrameStateBuilder<T> state);
+    protected abstract T createTarget(BciBlock trueBlock, F state);
 
     /**
      * Returns a block begin node with the specified state. If the specified probability is 0, the
      * block deoptimizes immediately.
      */
-    protected abstract T createBlockTarget(double probability, BciBlock bciBlock, AbstractFrameStateBuilder<T> stateAfter);
+    protected abstract T createBlockTarget(double probability, BciBlock bciBlock, F stateAfter);
 
     protected abstract void processBlock(BciBlock block);
 
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Mon Apr 07 15:43:00 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Mon Apr 07 16:13:53 2014 +0200
@@ -121,7 +121,7 @@
         /**
          * Gets the current frame state being processed by this builder.
          */
-        protected AbstractFrameStateBuilder<ValueNode> getCurrentFrameState() {
+        protected HIRFrameStateBuilder getCurrentFrameState() {
             return parser.getFrameState();
         }
 
@@ -989,7 +989,7 @@
             }
 
             @Override
-            protected FixedNode createTarget(double probability, BciBlock block, AbstractFrameStateBuilder<ValueNode> stateAfter) {
+            protected FixedNode createTarget(double probability, BciBlock block, HIRFrameStateBuilder stateAfter) {
                 ValueNode fixed = super.createTarget(probability, block, stateAfter);
                 assert fixed instanceof FixedNode;
                 return (FixedNode) fixed;
@@ -997,9 +997,7 @@
             }
 
             @Override
-            protected FixedNode createTarget(BciBlock block, AbstractFrameStateBuilder<ValueNode> abstractState) {
-                assert abstractState instanceof HIRFrameStateBuilder;
-                HIRFrameStateBuilder state = (HIRFrameStateBuilder) abstractState;
+            protected FixedNode createTarget(BciBlock block, HIRFrameStateBuilder state) {
                 assert block != null && state != null;
                 assert !block.isExceptionEntry || state.stackSize() == 1;
 
@@ -1080,7 +1078,7 @@
              * 0, the block deoptimizes immediately.
              */
             @Override
-            protected AbstractBeginNode createBlockTarget(double probability, BciBlock block, AbstractFrameStateBuilder<ValueNode> stateAfter) {
+            protected AbstractBeginNode createBlockTarget(double probability, BciBlock block, HIRFrameStateBuilder stateAfter) {
                 FixedNode target = createTarget(probability, block, stateAfter);
                 AbstractBeginNode begin = AbstractBeginNode.begin(target);