Skip to content

Commit 34cf630

Browse files
committed
fix sp as last java frame
1 parent 3fffc80 commit 34cf630

1 file changed

Lines changed: 0 additions & 11 deletions

File tree

src/hotspot/cpu/s390/macroAssembler_s390.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3853,19 +3853,8 @@ void MacroAssembler::reset_last_Java_frame(bool allow_relocation) {
38533853
void MacroAssembler::set_top_ijava_frame_at_SP_as_last_Java_frame(Register sp, Register tmp1, bool allow_relocation, Label* jpc) {
38543854
assert_different_registers(sp, tmp1);
38553855

3856-
get_PC(tmp1);
38573856
if (jpc == nullptr || jpc->is_bound()) {
38583857
load_const_optimized(tmp1, jpc == nullptr ? pc() : target(*jpc));
3859-
if (jpc == nullptr) {
3860-
// We cannot trust that code generated by the C++ compiler saves R14
3861-
// to z_abi_160.return_pc, because sometimes it spills R14 using stmg at
3862-
// z_abi_160.gpr14 (e.g. InterpreterRuntime::_new()).
3863-
// Therefore we load the PC into tmp1 and let set_last_Java_frame() save
3864-
// it into the frame anchor.
3865-
get_PC(tmp1);
3866-
} else {
3867-
load_const_optimized(tmp1, target(*jpc));
3868-
}
38693858
} else {
38703859
load_const(tmp1, *jpc);
38713860
}

0 commit comments

Comments
 (0)