Skip to content

8339386: Assertion on AIX - original PC must be in the main code section of the compiled method #3998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

8339386: Assertion on AIX - original PC must be in the main code section of the compiled method #3998

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
972a763
Backport 9a25f822fb2529c1cae3ae909761381789d7b7b1
TheRealMDoerr Oct 7, 2024
6e4d7e8
Adaptations for 17u.
TheRealMDoerr Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/hotspot/cpu/ppc/frame_ppc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ bool frame::safe_for_sender(JavaThread *thread) {
return false;
}

abi_minframe* sender_abi = (abi_minframe*) fp;
volatile abi_minframe* sender_abi = (abi_minframe*) fp; // May get updated concurrently by deoptimization!
intptr_t* sender_sp = (intptr_t*) fp;
address sender_pc = (address) sender_abi->lr;;
address sender_pc = (address) sender_abi->lr;

// We must always be able to find a recognizable pc.
CodeBlob* sender_blob = CodeCache::find_blob_unsafe(sender_pc);
Expand All @@ -129,9 +129,20 @@ bool frame::safe_for_sender(JavaThread *thread) {
return false;
}

intptr_t* unextended_sender_sp = is_interpreted_frame() ? (intptr_t*)get_ijava_state()->sender_sp : sender_sp;

// It should be safe to construct the sender though it might not be valid.

frame sender(sender_sp, sender_pc);
// JDK-8339386 is different than the upstream version:
// The frame constructor doesn't check sanity of a deopt pc, but determines it.
// Other accessors for reading it are not available in 17u.
frame sender(sender_sp, sender_pc, unextended_sender_sp);
// If the sender is a deoptimized nmethod we need to check if the original pc is valid.
nmethod* sender_nm = sender_blob->as_nmethod_or_null();
if (sender_nm != nullptr && sender._deopt_state == is_deoptimized) {
address orig_pc = sender.pc();
if (!sender_nm->insts_contains_inclusive(orig_pc)) return false;
}

// Do we have a valid fp?
address sender_fp = (address) sender.fp();
Expand Down