Mercurial > hg > graal-compiler
changeset 10476:cd68d6902328
Fix invalidateInstalledCode and delete isInstalledCodeValid.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Fri, 21 Jun 2013 22:04:46 +0200 |
parents | 3489047ffea2 |
children | 7943479d36f3 |
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/HotSpotNmethod.java src/share/vm/graal/graalCompilerToVM.cpp |
diffstat | 4 files changed, 6 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVM.java Fri Jun 21 18:26:52 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVM.java Fri Jun 21 22:04:46 2013 +0200 @@ -229,7 +229,5 @@ */ void reprofile(long metaspaceMethod); - void invalidateInstalledCode(long nativeMethod); - - boolean isInstalledCodeValid(long nativeMethod); + void invalidateInstalledCode(HotSpotInstalledCode hotspotInstalledCode); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVMImpl.java Fri Jun 21 18:26:52 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/CompilerToVMImpl.java Fri Jun 21 22:04:46 2013 +0200 @@ -170,10 +170,7 @@ public native Object lookupAppendixInPool(HotSpotResolvedObjectType pool, int cpi, byte opcode); @Override - public native void invalidateInstalledCode(long nativeMethod); - - @Override - public native boolean isInstalledCodeValid(long nativeMethod); + public native void invalidateInstalledCode(HotSpotInstalledCode hotspotInstalledCode); @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/HotSpotNmethod.java Fri Jun 21 18:26:52 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotNmethod.java Fri Jun 21 22:04:46 2013 +0200 @@ -73,7 +73,7 @@ @Override public void invalidate() { - graalRuntime().getCompilerToVM().invalidateInstalledCode(codeBlob); + graalRuntime().getCompilerToVM().invalidateInstalledCode(this); } @Override
--- a/src/share/vm/graal/graalCompilerToVM.cpp Fri Jun 21 18:26:52 2013 +0200 +++ b/src/share/vm/graal/graalCompilerToVM.cpp Fri Jun 21 22:04:46 2013 +0200 @@ -1157,7 +1157,8 @@ C2V_END -C2V_VMENTRY(void, invalidateInstalledCode, (JNIEnv *env, jobject, jlong nativeMethod)) +C2V_VMENTRY(void, invalidateInstalledCode, (JNIEnv *env, jobject, jobject hotspotInstalledCode)) + jlong nativeMethod = HotSpotInstalledCode::codeBlob(hotspotInstalledCode); nmethod* m = (nmethod*)nativeMethod; if (!m->is_not_entrant()) { m->mark_for_deoptimization(); @@ -1167,11 +1168,6 @@ C2V_END -C2V_VMENTRY(jboolean, isInstalledCodeValid, (JNIEnv *env, jobject, jlong nativeMethod)) - nmethod* m = (nmethod*)nativeMethod; - return m->is_alive() && !m->is_not_entrant(); -C2V_END - #define CC (char*) /*cast a literal from (const char*)*/ #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &(c2v_ ## f)) @@ -1249,8 +1245,7 @@ {CC"getLocalVariableTable", CC"("HS_RESOLVED_METHOD")["LOCAL, FN_PTR(getLocalVariableTable)}, {CC"getFileName", CC"("HS_RESOLVED_JAVA_TYPE")"STRING, FN_PTR(getFileName)}, {CC"reprofile", CC"("METASPACE_METHOD")V", FN_PTR(reprofile)}, - {CC"invalidateInstalledCode", CC"(J)V", FN_PTR(invalidateInstalledCode)}, - {CC"isInstalledCodeValid", CC"(J)Z", FN_PTR(isInstalledCodeValid)}, + {CC"invalidateInstalledCode", CC"("HS_INSTALLED_CODE")V", FN_PTR(invalidateInstalledCode)}, }; int CompilerToVM_methods_count() {