archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8254265: s390 and linux 32 bit builds broken

Browse source 
Reviewed-by: coleenp, dholmes
This commit is contained in:
Martin Doerr 2020-10-09 11:51:21 +00:00
parent 4f9a1ffcdd
commit 2bc8bc5722
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp
View file

@ -856,7 +856,7 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(Register frame_
// Compute the beginning of the protected zone minus the requested frame size. // Compute the beginning of the protected zone minus the requested frame size.
__ z_sgr(tmp1, tmp2); __ z_sgr(tmp1, tmp2);
__ add2reg(tmp1, JavaThread::stack_guard_zone_size()); __ add2reg(tmp1, StackOverflow::stack_guard_zone_size());
// Add in the size of the frame (which is the same as subtracting it from the // Add in the size of the frame (which is the same as subtracting it from the
// SP, which would take another register. // SP, which would take another register.

2
src/hotspot/os/linux/os_linux.cpp
View file

@ -1935,7 +1935,7 @@ void * os::Linux::dll_load_in_vmthread(const char *filename, char *ebuf,
StackOverflow* overflow_state = jt->stack_overflow_state(); StackOverflow* overflow_state = jt->stack_overflow_state();
if (!overflow_state->stack_guard_zone_unused() && // Stack not yet fully initialized if (!overflow_state->stack_guard_zone_unused() && // Stack not yet fully initialized
overflow_state->stack_guards_enabled()) { // No pending stack overflow exceptions overflow_state->stack_guards_enabled()) { // No pending stack overflow exceptions
if (!os::guard_memory((char *)jt->stack_end(), overflow_state->stack_guard_zone_size())) { if (!os::guard_memory((char *)jt->stack_end(), StackOverflow::stack_guard_zone_size())) {
warning("Attempt to reguard stack yellow zone failed."); warning("Attempt to reguard stack yellow zone failed.");
} }
} }

6
src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
View file

@ -838,8 +838,8 @@ void os::workaround_expand_exec_shield_cs_limit() {
if (os::is_primordial_thread()) { if (os::is_primordial_thread()) {
address limit = Linux::initial_thread_stack_bottom(); address limit = Linux::initial_thread_stack_bottom();
if (! DisablePrimordialThreadGuardPages) { if (! DisablePrimordialThreadGuardPages) {
limit += JavaThread::stack_red_zone_size() + limit += StackOverflow::stack_red_zone_size() +
JavaThread::stack_yellow_zone_size(); StackOverflow::stack_yellow_zone_size();
} }
os::Linux::expand_stack_to(limit); os::Linux::expand_stack_to(limit);
} }
@ -860,7 +860,7 @@ void os::workaround_expand_exec_shield_cs_limit() {
* we don't have much control or understanding of the address space, just let it slide. * we don't have much control or understanding of the address space, just let it slide.
*/ */
char* hint = (char*)(Linux::initial_thread_stack_bottom() - char* hint = (char*)(Linux::initial_thread_stack_bottom() -
(JavaThread::stack_guard_zone_size() + page_size)); (StackOverflow::stack_guard_zone_size() + page_size));
char* codebuf = os::attempt_reserve_memory_at(hint, page_size); char* codebuf = os::attempt_reserve_memory_at(hint, page_size);
if (codebuf == NULL) { if (codebuf == NULL) {