Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8258380: [JVMCI] don't clear InstalledCode reference when unloading J…
…VMCI nmethods

Reviewed-by: kvn, eosterlund
  • Loading branch information
Tom Rodriguez committed Dec 15, 2020
1 parent e7aa5fe commit 1f556d22caecd9bd63a303e1a3ed2b98c629079d
Showing 2 changed files with 6 additions and 1 deletion.
@@ -1270,7 +1270,6 @@ void nmethod::make_unloaded() {
JVMCINMethodData* nmethod_data = jvmci_nmethod_data();
if (nmethod_data != NULL) {
nmethod_data->invalidate_nmethod_mirror(this);
nmethod_data->clear_nmethod_mirror(this);
}
#endif
}
@@ -714,6 +714,12 @@ void JVMCINMethodData::invalidate_nmethod_mirror(nmethod* nm) {
HotSpotJVMCI::InstalledCode::set_entryPoint(jvmciEnv, nmethod_mirror, 0);
}
}

if (_nmethod_mirror_index != -1 && nm->is_unloaded()) {
// Drop the reference to the nmethod mirror object but don't clear the actual oop reference. Otherwise
// it would appear that the nmethod didn't need to be unloaded in the first place.
_nmethod_mirror_index = -1;
}
}

JVMCIRuntime::JVMCIRuntime(int id) {

1 comment on commit 1f556d2

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 1f556d2 Dec 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.