# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1421001337 -3600
# Node ID 00ec3ff518cea89e0fbd53e414b4b13724d554f0
# Parent  bf382ef598384e93e8038b3b0af11fe939aa41d4
Fixed a regression in the new BciBlock order algorithm when compiling methods with JSR bytecode.

diff -r bf382ef59838 -r 00ec3ff518ce graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java	Sun Jan 11 19:19:52 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java	Sun Jan 11 19:35:37 2015 +0100
@@ -25,7 +25,6 @@
 import static com.oracle.graal.api.code.CallingConvention.Type.*;
 import static com.oracle.graal.hotspot.HotSpotForeignCallLinkage.RegisterEffect.*;
 
-import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.api.replacements.*;
 import com.oracle.graal.compiler.common.type.*;
diff -r bf382ef59838 -r 00ec3ff518ce graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java	Sun Jan 11 19:19:52 2015 +0100
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java	Sun Jan 11 19:35:37 2015 +0100
@@ -652,6 +652,7 @@
                     } else {
                         successor.initJsrAlternatives();
                         clone = successor.copy();
+                        blocksNotYetAssignedId++;
                         clone.setJsrScope(nextScope);
                         successor.getJsrAlternatives().put(nextScope, clone);
                     }