Mercurial > hg > graal-jvmci-8
changeset 19480:ff67cb313c9a
Simplify return block and unwind block creation in the graph builder.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 18 Feb 2015 17:59:18 +0100 |
parents | 7837f7aab5ed |
children | b0ba6f39cb60 |
files | graal/com.oracle.graal.java/src/com/oracle/graal/java/GraphBuilderPhase.java |
diffstat | 1 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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()); } } }