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

8178363: Incorrect check for nmethod re-registration in C1

Browse source 
Reviewed-by: stefank, rbackman
This commit is contained in:
Per Lidén 2017-04-12 08:49:08 +02:00
parent f7277d87d5
commit 221d948b51
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hotspot/src/share/vm/c1/c1_Runtime1.cpp
View file

@ -1221,12 +1221,13 @@ JRT_ENTRY(void, Runtime1::patch_code(JavaThread* thread, Runtime1::StubID stub_i
// If we are patching in a non-perm oop, make sure the nmethod // If we are patching in a non-perm oop, make sure the nmethod
// is on the right list. // is on the right list.
if (ScavengeRootsInCode && ((mirror.not_null() && mirror()->is_scavengable()) || if (ScavengeRootsInCode) {
(appendix.not_null() && appendix->is_scavengable()))) {
MutexLockerEx ml_code (CodeCache_lock, Mutex::_no_safepoint_check_flag); MutexLockerEx ml_code (CodeCache_lock, Mutex::_no_safepoint_check_flag);
nmethod* nm = CodeCache::find_nmethod(caller_frame.pc()); nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
guarantee(nm != NULL, "only nmethods can contain non-perm oops"); guarantee(nm != NULL, "only nmethods can contain non-perm oops");
if (!nm->on_scavenge_root_list()) { if (!nm->on_scavenge_root_list() &&
((mirror.not_null() && mirror()->is_scavengable()) ||
(appendix.not_null() && appendix->is_scavengable()))) {
CodeCache::add_scavenge_root_nmethod(nm); CodeCache::add_scavenge_root_nmethod(nm);
} }