# HG changeset patch # User Tom Rodriguez # Date 1454093409 28800 # Node ID 5f3a13d32883f639b3c187e8ed2ec29145f416aa # Parent 2a73030c41ade180c54a821d37d2cc71ab2a60f8 Update jvmci import: fixes for merge 8u66 diff -r 2a73030c41ad -r 5f3a13d32883 graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java --- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java Fri Jan 29 10:22:38 2016 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java Fri Jan 29 10:50:09 2016 -0800 @@ -67,7 +67,7 @@ // Discard the return address, thus completing restoration of caller frame masm.incrementq(rsp, 8); - if (System.getProperty("java.specification.version").compareTo("1.9") < 0) { + if (System.getProperty("java.specification.version").compareTo("1.8") < 0) { // Restore rsp from rbp if the exception PC is a method handle call site. AMD64Address dst = new AMD64Address(thread, isMethodHandleReturnOffset); masm.cmpl(dst, 0); diff -r 2a73030c41ad -r 5f3a13d32883 mx.graal/suite.py --- a/mx.graal/suite.py Fri Jan 29 10:22:38 2016 +0100 +++ b/mx.graal/suite.py Fri Jan 29 10:50:09 2016 -0800 @@ -39,7 +39,7 @@ { "name" : "jvmci", "optional" : "true", - "version" : "c2687aa5e5ca8815e540e3c4716388e3d694c481", + "version" : "071a85b9e631ba1e6233d622f5b56c64d94aa6c1", "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"},