Mercurial > hg > truffle

changeset 18826:00ec3ff518ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a regression in the new BciBlock order algorithm when compiling methods with JSR bytecode.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sun, 11 Jan 2015 19:35:37 +0100
parents bf382ef59838
children 7b2834339048
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/ForeignCallStub.java graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java
diffstat 2 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.*;
--- 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);
                     }