Mercurial > hg > truffle
changeset 12535:cee7f686c470
rename CompilerToVm.dontInline to doNotInlineOrCompile
author | Matthias Grimmer <grimmer@ssw.jku.at> |
---|---|
date | Wed, 23 Oct 2013 13:40:56 +0200 |
parents | b34114019fd0 |
children | 16e507054ebb |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVM.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVMImpl.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java src/share/vm/graal/graalCompilerToVM.cpp |
diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVM.java Wed Oct 23 13:33:40 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVM.java Wed Oct 23 13:40:56 2013 +0200 @@ -218,7 +218,7 @@ long readUnsafeKlassPointer(Object o); - void dontInline(long metaspaceMethod); + void doNotInlineOrCompile(long metaspaceMethod); /** * Invalidates the profiling information and restarts profiling upon the next invocation.
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVMImpl.java Wed Oct 23 13:33:40 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVMImpl.java Wed Oct 23 13:40:56 2013 +0200 @@ -178,7 +178,7 @@ public native long readUnsafeKlassPointer(Object o); @Override - public native void dontInline(long metaspaceMethod); + public native void doNotInlineOrCompile(long metaspaceMethod); @Override public Object executeCompiledMethod(Object arg1, Object arg2, Object arg3, HotSpotInstalledCode hotspotInstalledCode) throws InvalidInstalledCodeException {
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java Wed Oct 23 13:33:40 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotResolvedJavaMethod.java Wed Oct 23 13:40:56 2013 +0200 @@ -194,7 +194,7 @@ */ public void setDontInline() { dontInline = true; - runtime().getCompilerToVM().dontInline(metaspaceMethod); + runtime().getCompilerToVM().doNotInlineOrCompile(metaspaceMethod); } /**
--- a/src/share/vm/graal/graalCompilerToVM.cpp Wed Oct 23 13:33:40 2013 +0200 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Wed Oct 23 13:40:56 2013 +0200 @@ -642,7 +642,7 @@ return id; } -C2V_VMENTRY(void, dontInline,(JNIEnv *, jobject, jlong metaspace_method)) +C2V_VMENTRY(void, doNotInlineOrCompile,(JNIEnv *, jobject, jlong metaspace_method)) methodHandle method = asMethod(metaspace_method); method->set_not_c1_compilable(); method->set_not_c2_compilable(); @@ -1203,7 +1203,7 @@ {CC"getUniqueImplementor", CC"("HS_RESOLVED_TYPE")"RESOLVED_TYPE, FN_PTR(getUniqueImplementor)}, {CC"getStackTraceElement", CC"("METASPACE_METHOD"I)"STACK_TRACE_ELEMENT, FN_PTR(getStackTraceElement)}, {CC"initializeMethod", CC"("METASPACE_METHOD HS_RESOLVED_METHOD")V", FN_PTR(initializeMethod)}, - {CC"dontInline", CC"("METASPACE_METHOD")V", FN_PTR(dontInline)}, + {CC"doNotInlineOrCompile", CC"("METASPACE_METHOD")V", FN_PTR(doNotInlineOrCompile)}, {CC"initializeMethodData", CC"("METASPACE_METHOD_DATA METHOD_DATA")V", FN_PTR(initializeMethodData)}, {CC"isMethodCompilable", CC"("METASPACE_METHOD")Z", FN_PTR(isMethodCompilable)}, {CC"getCompiledCodeSize", CC"("METASPACE_METHOD")I", FN_PTR(getCompiledCodeSize)},