changeset 23249:1efad828d77f

Undo assignment of different bci for unwind block.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 02 Jan 2016 16:49:35 +0100
parents 810f72a1c5f3
children e67189aa2e06
files graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java	Sat Jan 02 13:57:16 2016 +0100
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java	Sat Jan 02 16:49:35 2016 +0100
@@ -848,7 +848,7 @@
         ExceptionDispatchBlock unwindBlock = new ExceptionDispatchBlock();
         unwindBlock.startBci = -1;
         unwindBlock.endBci = -1;
-        unwindBlock.deoptBci = BytecodeFrame.UNWIND_BCI;
+        unwindBlock.deoptBci = method.isSynchronized() ? BytecodeFrame.UNWIND_BCI : BytecodeFrame.AFTER_EXCEPTION_BCI;
         unwindBlock.setId(newBlocks.length - 1);
         newBlocks[newBlocks.length - 1] = unwindBlock;