stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8303147: [s390x] fast & slow debug builds are broken

Browse Source 
Reviewed-by: mdoerr
This commit is contained in:
Amit Kumar 2023-04-04 14:28:09 +00:00 committed by Martin Doerr
parent f9ed825266
commit 62bd2ebac4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hotspot/cpu/s390/c1_LIRAssembler_s390.cpp
View File

@ -2429,15 +2429,17 @@ void LIR_Assembler::setup_md_access(ciMethod* method, int bci,
void LIR_Assembler::store_parameter(Register r, int param_num) {
assert(param_num >= 0, "invalid num");
int offset_in_bytes = param_num * BytesPerWord + FrameMap::first_available_sp_in_frame;
assert(offset_in_bytes < frame_map()->reserved_argument_area_size(), "invalid offset");
int offset_in_bytes = param_num * BytesPerWord;
check_reserved_argument_area(offset_in_bytes);
offset_in_bytes += FrameMap::first_available_sp_in_frame;
__ z_stg(r, offset_in_bytes, Z_SP);
}
void LIR_Assembler::store_parameter(jint c, int param_num) {
assert(param_num >= 0, "invalid num");
int offset_in_bytes = param_num * BytesPerWord + FrameMap::first_available_sp_in_frame;
assert(offset_in_bytes < frame_map()->reserved_argument_area_size(), "invalid offset");
int offset_in_bytes = param_num * BytesPerWord;
check_reserved_argument_area(offset_in_bytes);
offset_in_bytes += FrameMap::first_available_sp_in_frame;
__ store_const(Address(Z_SP, offset_in_bytes), c, Z_R1_scratch, true);
}

3
src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp
View File

@ -41,8 +41,7 @@
void store_parameter(jint c, int param_num);
void check_reserved_argument_area(int bytes) {
assert(bytes + FrameMap::first_available_sp_in_frame <= frame_map()->reserved_argument_area_size(),
"reserved_argument_area too small");
assert(bytes <= frame_map()->reserved_argument_area_size(), "reserved_argument_area too small");
}
enum {