changeset 15029:e5eec42f42f8

AbstractBytecodeParser: move createBlockTarget to GraphBuilderPhase.
author Josef Eisl <josef.eisl@jku.at>
date Mon, 07 Apr 2014 16:44:05 +0200
parents 7ee9decb2784
children e098038093d5
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, 1 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java	Mon Apr 07 16:41:14 2014 +0200
+++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java	Mon Apr 07 16:44:05 2014 +0200
@@ -571,12 +571,6 @@
     }
 
     @Override
-    protected Value createBlockTarget(double probability, BciBlock bciBlock, LIRFrameStateBuilder stateAfter) {
-        // TODO Auto-generated method stub
-        throw GraalInternalError.unimplemented("Auto-generated method stub");
-    }
-
-    @Override
     protected void processBlock(BciBlock block) {
         iterateBytecodesForBlock(block);
     }
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java	Mon Apr 07 16:41:14 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/AbstractBytecodeParser.java	Mon Apr 07 16:44:05 2014 +0200
@@ -916,12 +916,6 @@
 
     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, F stateAfter);
-
     protected abstract void processBlock(BciBlock block);
 
     protected abstract void appendGoto(T target);
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Mon Apr 07 16:41:14 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Mon Apr 07 16:44:05 2014 +0200
@@ -1076,8 +1076,7 @@
              * Returns a block begin node with the specified state. If the specified probability is
              * 0, the block deoptimizes immediately.
              */
-            @Override
-            protected AbstractBeginNode createBlockTarget(double probability, BciBlock block, HIRFrameStateBuilder stateAfter) {
+            private AbstractBeginNode createBlockTarget(double probability, BciBlock block, HIRFrameStateBuilder stateAfter) {
                 FixedNode target = createTarget(probability, block, stateAfter);
                 AbstractBeginNode begin = AbstractBeginNode.begin(target);