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

8145137: Incorrect call signature can be used in nmethod::preserve_callee_argument_oops

Browse source 
Reviewed-by: roland, jrose
This commit is contained in:
Vladimir Ivanov 2015-12-11 15:03:11 +03:00
parent e56a7de478
commit 1a4c3a752d
4 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hotspot/src/share/vm/runtime/sharedRuntime.cpp
View file

@ -1078,10 +1078,7 @@ methodHandle SharedRuntime::extract_attached_method(vframeStream& vfst) {
address pc = vfst.frame_pc();
{ // Get call instruction under lock because another thread may be busy patching it.
MutexLockerEx ml_patch(Patching_lock, Mutex::_no_safepoint_check_flag);
if (NativeCall::is_call_before(pc)) {
NativeCall* ncall = nativeCall_before(pc);
return caller_nm->attached_method(ncall->instruction_address());
}
return caller_nm->attached_method_before_pc(pc);
}
return NULL;
}