infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-12 14:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

8301697: [s390] Optimized-build is broken

Browse Source 
Reviewed-by: tsteele, lucy
This commit is contained in:
Amit Kumar 2023-02-13 16:14:33 +00:00 committed by Tyler Steele
parent f4d4fa500c
commit 101db262e1
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hotspot/cpu/s390/runtime_s390.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016 SAP SE. All rights reserved.
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. 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
@ -137,8 +137,8 @@ void OptoRuntime::generate_exception_blob() {
__ clear_mem(Address(Z_thread, JavaThread::exception_oop_offset()),sizeof(intptr_t));
#ifdef ASSERT
__ clear_mem(Address(Z_thread, JavaThread::exception_handler_pc_offset()), sizeof(intptr_t));
__ clear_mem(Address(Z_thread, JavaThread::exception_pc_offset()), sizeof(intptr_t));
#endif
NOT_PRODUCT(__ clear_mem(Address(Z_thread, JavaThread::exception_pc_offset()), sizeof(intptr_t)));
__ z_br(handle_exception);

15
src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
View File

@ -1,6 +1,6 @@
/*
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2020 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
@ -1080,8 +1080,9 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) {
generate_stack_overflow_check(frame_size, fp/*tmp1*/);
}
DEBUG_ONLY(__ z_cg(Z_R14, _z_abi16(return_pc), Z_SP));
__ asm_assert_eq("killed Z_R14", 0);
// asm_assert* is a nop in product builds
NOT_PRODUCT(__ z_cg(Z_R14, _z_abi16(return_pc), Z_SP));
NOT_PRODUCT(__ asm_assert_eq("killed Z_R14", 0));
__ resize_frame_absolute(sp_after_resize, fp, true);
__ save_return_pc(Z_R14);
@ -1351,10 +1352,8 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
}
#endif // ASSERT
#ifdef ASSERT
// Save the return PC into the callers frame for assertion in generate_fixed_frame.
__ save_return_pc(Z_R14);
#endif
NOT_PRODUCT(__ save_return_pc(Z_R14));
// Generate the code to allocate the interpreter stack frame.
generate_fixed_frame(true);
@ -1719,10 +1718,8 @@ address TemplateInterpreterGenerator::generate_normal_entry(bool synchronized) {
}
#endif // ASSERT
#ifdef ASSERT
// Save the return PC into the callers frame for assertion in generate_fixed_frame.
__ save_return_pc(Z_R14);
#endif
NOT_PRODUCT(__ save_return_pc(Z_R14));
// Generate the code to allocate the interpreter stack frame.
generate_fixed_frame(false);