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

8295872: [PPC64] JfrGetCallTrace: Need pc == nullptr check before frame constructor

Browse Source 
Reviewed-by: shade, lucy, mbaesken
This commit is contained in:
Martin Doerr 2022-11-03 14:29:51 +00:00
parent 2a79dfc1f9
commit 59a13b1856
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hotspot/os_cpu/aix_ppc/javaThread_aix_ppc.cpp
View File

@ -32,7 +32,9 @@
frame JavaThread::pd_last_frame() {
assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
intptr_t* sp = Atomic::load_acquire(&_anchor._last_Java_sp);
// Only called by current thread or when the thread is suspended.
// No memory barrier needed, here. Only writer must write sp last (for use by profiler).
intptr_t* sp = last_Java_sp();
address pc = _anchor.last_Java_pc();
return frame(sp, pc);
@ -43,9 +45,12 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
// If we have a last_Java_frame, then we should use it even if
// isInJava == true. It should be more reliable than ucontext info.
if (has_last_Java_frame() && frame_anchor()->walkable()) {
frame last_frame = pd_last_frame();
if (last_frame.pc() == nullptr) return false;
*fr_addr = last_frame;
intptr_t* sp = last_Java_sp();
address pc = _anchor.last_Java_pc();
// pc can be seen as null because not all writers use store pc + release store sp.
// Simply discard the sample in this very rare case.
if (pc == nullptr) return false;
*fr_addr = frame(sp, pc);
return true;
}

13
src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp
View File

@ -31,7 +31,9 @@
frame JavaThread::pd_last_frame() {
assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
intptr_t* sp = Atomic::load_acquire(&_anchor._last_Java_sp);
// Only called by current thread or when the thread is suspended.
// No memory barrier needed, here. Only writer must write sp last (for use by profiler).
intptr_t* sp = last_Java_sp();
address pc = _anchor.last_Java_pc();
return frame(sp, pc);
@ -42,9 +44,12 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
// If we have a last_Java_frame, then we should use it even if
// isInJava == true. It should be more reliable than ucontext info.
if (has_last_Java_frame() && frame_anchor()->walkable()) {
frame last_frame = pd_last_frame();
if (last_frame.pc() == nullptr) return false;
*fr_addr = last_frame;
intptr_t* sp = last_Java_sp();
address pc = _anchor.last_Java_pc();
// pc can be seen as null because not all writers use store pc + release store sp.
// Simply discard the sample in this very rare case.
if (pc == nullptr) return false;
*fr_addr = frame(sp, pc);
return true;
}