changeset 22643:9ecfccd6eec1

Update jvmci import version
author Stefan Anzinger <stefan.anzinger@oracle.com>
date Wed, 16 Sep 2015 14:12:37 +0200
parents 3345942ec7f3
children 54257f3273df
files graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerator.java mx.graal/suite.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerator.java	Wed Sep 16 12:19:31 2015 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/gen/LIRGenerator.java	Wed Sep 16 14:12:37 2015 +0200
@@ -199,7 +199,7 @@
      */
     public AllocatableValue resultOperandFor(JavaKind javaKind, LIRKind lirKind) {
         Register reg = res.getFrameMapBuilder().getRegisterConfig().getReturnRegister(javaKind);
-        assert target().arch.canStoreValue(reg.getRegisterCategory(), lirKind.getPlatformKind());
+        assert target().arch.canStoreValue(reg.getRegisterCategory(), lirKind.getPlatformKind()) : reg.getRegisterCategory() + " " + lirKind.getPlatformKind();
         return reg.asValue(lirKind);
     }
 
--- a/mx.graal/suite.py	Wed Sep 16 12:19:31 2015 +0200
+++ b/mx.graal/suite.py	Wed Sep 16 14:12:37 2015 +0200
@@ -6,7 +6,7 @@
     "suites": [
             {
                "name" : "jvmci",
-               "version" : "bfd5fdca1ce974ad6f88f77cd1f2b3b683e1fc2c",
+               "version" : "c79ee6cd7f53f76982728075c62154f33a0452d3",
                "urls" : [
                     {"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-jvmci-8", "kind" : "hg"},
                     {"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},