Skip to content

8267235: [macos_aarch64] InterpreterRuntime::throw_pending_exception messing up LR results in crash #4115

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
VladimirKempik wants to merge 2 commits into from
Closed

8267235: [macos_aarch64] InterpreterRuntime::throw_pending_exception messing up LR results in crash #4115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b7c4ce
JDK-8267235: [macos_aarch64] InterpreterRuntime::throw_pending_except…
May 19, 2021
edea0a6
Update the fix
May 20, 2021
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
5 changes: 5 additions & 0 deletions src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,11 @@ void MacroAssembler::call_VM_base(Register oop_result,
// do the call, remove parameters
MacroAssembler::call_VM_leaf_base(entry_point, number_of_arguments, &l);

// lr could be poisoned with PAC signature during throw_pending_exception
// if it was tail-call optimized by compiler, since lr is not callee-saved
// reload it with proper value
adr(lr, l);

Copy link
Contributor

@theRealAph theRealAph May 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this any different from adr(lr, l) ?

Copy link
Author

@VladimirKempik VladimirKempik May 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this gives exactly same result, thanks!

// reset last Java frame
// Only interpreter should have to clear fp
reset_last_Java_frame(true);
Expand Down