# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1424278758 -3600
# Node ID ff67cb313c9a56680149f4bfa6381ce97e742259
# Parent  7837f7aab5ed3baf4874dd84618bb9a2be337a66
Simplify return block and unwind block creation in the graph builder.

diff -r 7837f7aab5ed -r ff67cb313c9a graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Wed Feb 18 17:52:22 2015 +0100
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java	Wed Feb 18 17:59:18 2015 +0100
@@ -354,11 +354,9 @@
                 return header.loopEnd + 1;
             }
 
-            private BciBlock returnBlock(int bci) {
+            private BciBlock returnBlock() {
                 if (returnBlock == null) {
                     returnBlock = new BciBlock();
-                    returnBlock.startBci = bci;
-                    returnBlock.endBci = bci;
                     returnBlock.setId(Integer.MAX_VALUE);
                 }
                 return returnBlock;
@@ -367,8 +365,6 @@
             private BciBlock unwindBlock() {
                 if (unwindBlock == null) {
                     unwindBlock = new ExceptionDispatchBlock();
-                    unwindBlock.startBci = -1;
-                    unwindBlock.endBci = -1;
                     unwindBlock.deoptBci = method.isSynchronized() ? BytecodeFrame.UNWIND_BCI : BytecodeFrame.AFTER_EXCEPTION_BCI;
                     unwindBlock.setId(Integer.MAX_VALUE);
                 }
@@ -1037,7 +1033,7 @@
                             frameState.push(x.getKind(), x);
                         }
                         assert returnCount > 1;
-                        appendGoto(returnBlock(bci()));
+                        appendGoto(returnBlock());
                     }
                 }
             }