archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8188102: [JVMCI] Convert special JVMCI oops in nmethod to jweak values

Browse source 
Reviewed-by: never, kvn, kbarrett
This commit is contained in:
Doug Simon 2017-11-06 12:53:55 +01:00
parent 67b21ffa1d
commit f37bbe430d
13 changed files with 146 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
View file

@ -1039,7 +1039,7 @@ C2V_VMENTRY(jint, installCode, (JNIEnv *jniEnv, jobject, jobject target, jobject
if (result != JVMCIEnv::ok) {
assert(cb == NULL, "should be");
} else {
if (!installed_code_handle.is_null()) {
if (installed_code_handle.not_null()) {
assert(installed_code_handle->is_a(InstalledCode::klass()), "wrong type");
nmethod::invalidate_installed_code(installed_code_handle, CHECK_0);
{
@ -1058,13 +1058,6 @@ C2V_VMENTRY(jint, installCode, (JNIEnv *jniEnv, jobject, jobject target, jobject
HotSpotInstalledCode::set_codeSize(installed_code_handle, cb->code_size());
}
}
nmethod* nm = cb->as_nmethod_or_null();
if (nm != NULL && installed_code_handle->is_scavengable()) {
assert(nm->detect_scavenge_root_oops(), "nm should be scavengable if installed_code is scavengable");
if (!UseG1GC) {
assert(nm->on_scavenge_root_list(), "nm should be on scavengable list");
}
}
}
}
return result;