Skip to content
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

Jump to bottom

8301095: [s390x] TestDwarf.java fails #12306

Closed
wants to merge 5 commits into from
Closed

8301095: [s390x] TestDwarf.java fails #12306

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4921c79
adds additional check for frame detection
offamitkumar Jan 25, 2023
e93919a
updates header year
offamitkumar Jan 25, 2023
1e828b8
no need to fetch sender_sp again
offamitkumar Jan 31, 2023
9dd8e10
addressing Lutz comments
offamitkumar Jan 31, 2023
476acfe
Merge branch 'master' into test_dwarf
offamitkumar Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp
View file
Open in desktop
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2019 SAP SE. All rights reserved.
* Copyright (c) 2016, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -172,7 +172,14 @@ frame os::get_sender_for_C_frame(frame* fr) {
return frame(fr->sender_sp(), fr->sender_pc());
}
} else {
return frame(fr->sender_sp(), fr->native_sender_pc());
offamitkumar marked this conversation as resolved.
Show resolved Hide resolved
intptr_t* sender_sp = fr->sender_sp();
address sender_fp = (address)*sender_sp;
ptrdiff_t entry_len = sender_fp - (address)sender_sp;
if (entry_len < frame::z_abi_160_size) {
return frame(sender_sp, fr->sender_pc());
} else {
return frame(sender_sp, fr->native_sender_pc());
}
}
}
}
Expand Down