Mercurial > hg > graal-compiler
diff graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64OptimizedCallTargetInstrumentationFactory.java @ 23348:9306a9611097
Update JVMCI import: Make CallingConvention.Type extensible; remove unused stackOnly parameter
author | Christian Wimmer <christian.wimmer@oracle.com> |
---|---|
date | Thu, 21 Jan 2016 14:24:24 -0800 |
parents | 52f4acf6f365 |
children | 39f9960bb6ae |
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64OptimizedCallTargetInstrumentationFactory.java Thu Jan 21 10:35:29 2016 -0800 +++ b/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64OptimizedCallTargetInstrumentationFactory.java Thu Jan 21 14:24:24 2016 -0800 @@ -22,8 +22,8 @@ */ package com.oracle.graal.truffle.hotspot.amd64; +import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall; import jdk.vm.ci.amd64.AMD64; -import jdk.vm.ci.code.CallingConvention.Type; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.code.Register; @@ -54,7 +54,7 @@ protected void injectTailCallCode() { @SuppressWarnings("hiding") AMD64MacroAssembler asm = (AMD64MacroAssembler) this.asm; - Register thisRegister = codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCall, JavaKind.Object)[0]; + Register thisRegister = codeCache.getRegisterConfig().getCallingConventionRegisters(JavaCall, JavaKind.Object)[0]; Register spillRegister = AMD64.r10; // TODO(mg): fix me Label doProlog = new Label();