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

8216541: CompiledICHolders of VM locked unloaded nmethods are released too late

Browse source 
Reviewed-by: kvn, thartmann
This commit is contained in:
Erik Österlund 2019-02-05 20:06:10 +01:00
parent ac1b5fb59a
commit 4e8a04bbf1
7 changed files with 21 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/hotspot/share/code/nmethod.cpp
View file

@ -1099,6 +1099,12 @@ void nmethod::make_unloaded() {
assert(SafepointSynchronize::is_at_safepoint() || Thread::current()->is_ConcurrentGC_thread(),
"must be at safepoint");
{
// Clear ICStubs and release any CompiledICHolders.
CompiledICLocker ml(this);
clear_ic_callsites();
}
// Unregister must be done before the state change
{
MutexLockerEx ml(SafepointSynchronize::is_at_safepoint() ? NULL : CodeCache_lock,
@ -1291,10 +1297,11 @@ bool nmethod::make_not_entrant_or_zombie(int state) {
}
// Clear ICStubs to prevent back patching stubs of zombie or flushed
// nmethods during the next safepoint (see ICStub::finalize).
// nmethods during the next safepoint (see ICStub::finalize), as well
// as to free up CompiledICHolder resources.
{
CompiledICLocker ml(this);
clear_ic_stubs();
clear_ic_callsites();
}
// zombie only - if a JVMTI agent has enabled the CompiledMethodUnload
@ -1326,6 +1333,7 @@ bool nmethod::make_not_entrant_or_zombie(int state) {
}
void nmethod::flush() {
MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
// Note that there are no valid oops in the nmethod anymore.
assert(!is_osr_method() || is_unloaded() || is_zombie(),
"osr nmethod must be unloaded or zombie before flushing");