Skip to content

Commit 7ae447f

Browse files
offamitkumarTyler Steele
authored and
Tyler Steele
committed
8301095: [s390x] TestDwarf.java fails
Reviewed-by: lucy, tsteele
1 parent 9c80b8a commit 7ae447f

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/hotspot/os_cpu/linux_s390/os_linux_s390.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
3-
* Copyright (c) 2016, 2019 SAP SE. All rights reserved.
3+
* Copyright (c) 2016, 2023 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
66
* This code is free software; you can redistribute it and/or modify it
@@ -172,7 +172,14 @@ frame os::get_sender_for_C_frame(frame* fr) {
172172
return frame(fr->sender_sp(), fr->sender_pc());
173173
}
174174
} else {
175-
return frame(fr->sender_sp(), fr->native_sender_pc());
175+
intptr_t* sender_sp = fr->sender_sp();
176+
address sender_fp = (address)*sender_sp;
177+
ptrdiff_t entry_len = sender_fp - (address)sender_sp;
178+
if (entry_len < frame::z_abi_160_size) {
179+
return frame(sender_sp, fr->sender_pc());
180+
} else {
181+
return frame(sender_sp, fr->native_sender_pc());
182+
}
176183
}
177184
}
178185
}

0 commit comments

Comments
 (0)