stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8283306: re-resolving indirect call to non-entrant nmethod can crash

Browse Source 
Reviewed-by: thartmann, never
This commit is contained in:
Dean Long 2022-05-05 21:28:50 +00:00
parent 4957bc7396
commit 6d7e446162
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/hotspot/share/runtime/sharedRuntime.cpp
View File

@ -1817,29 +1817,28 @@ methodHandle SharedRuntime::reresolve_call_site(TRAPS) {
// CLEANUP - with lazy deopt shouldn't need this lock // CLEANUP - with lazy deopt shouldn't need this lock
nmethodLocker nmlock(caller_nm); nmethodLocker nmlock(caller_nm);
// Check relocations for the matching call to 1) avoid false positives,
// and 2) determine the type.
if (call_addr != NULL) { if (call_addr != NULL) {
// On x86 the logic for finding a call instruction is blindly checking for a call opcode 5
// bytes back in the instruction stream so we must also check for reloc info.
RelocIterator iter(caller_nm, call_addr, call_addr+1); RelocIterator iter(caller_nm, call_addr, call_addr+1);
int ret = iter.next(); // Get item bool ret = iter.next(); // Get item
if (ret) { if (ret) {
assert(iter.addr() == call_addr, "must find call"); bool is_static_call = false;
if (iter.type() == relocInfo::static_call_type) { switch (iter.type()) {
case relocInfo::static_call_type:
is_static_call = true; is_static_call = true;
} else {
assert(iter.type() == relocInfo::virtual_call_type ||
iter.type() == relocInfo::opt_virtual_call_type
, "unexpected relocInfo. type");
}
} else {
assert(!UseInlineCaches, "relocation info. must exist for this address");
}
case relocInfo::virtual_call_type:
case relocInfo::opt_virtual_call_type:
// Cleaning the inline cache will force a new resolve. This is more robust // Cleaning the inline cache will force a new resolve. This is more robust
// than directly setting it to the new destination, since resolving of calls // than directly setting it to the new destination, since resolving of calls
// is always done through the same code path. (experience shows that it // is always done through the same code path. (experience shows that it
// leads to very hard to track down bugs, if an inline cache gets updated // leads to very hard to track down bugs, if an inline cache gets updated
// to a wrong method). It should not be performance critical, since the // to a wrong method). It should not be performance critical, since the
// resolve is only done once. // resolve is only done once.
guarantee(iter.addr() == call_addr, "must find call");
for (;;) { for (;;) {
ICRefillVerifier ic_refill_verifier; ICRefillVerifier ic_refill_verifier;
if (!clear_ic_at_addr(caller_nm, call_addr, is_static_call)) { if (!clear_ic_at_addr(caller_nm, call_addr, is_static_call)) {
@ -1848,6 +1847,11 @@ methodHandle SharedRuntime::reresolve_call_site(TRAPS) {
break; break;
} }
} }
break;
default:
break;
}
}
} }
} }