8225104: 32-bit build failures after JDK-8222252
Reviewed-by: bobv, rkennke, dholmes
This commit is contained in:
parent
0be741c70b
commit
cf3c6e0345
@ -1782,6 +1782,8 @@ void Arguments::set_heap_size() {
|
|||||||
// Limit the heap size to ErgoHeapSizeLimit
|
// Limit the heap size to ErgoHeapSizeLimit
|
||||||
reasonable_max = MIN2(reasonable_max, (julong)ErgoHeapSizeLimit);
|
reasonable_max = MIN2(reasonable_max, (julong)ErgoHeapSizeLimit);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef _LP64
|
||||||
if (UseCompressedOops) {
|
if (UseCompressedOops) {
|
||||||
// Limit the heap size to the maximum possible when using compressed oops
|
// Limit the heap size to the maximum possible when using compressed oops
|
||||||
julong max_coop_heap = (julong)max_heap_for_compressed_oops();
|
julong max_coop_heap = (julong)max_heap_for_compressed_oops();
|
||||||
@ -1818,6 +1820,8 @@ void Arguments::set_heap_size() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif // _LP64
|
||||||
|
|
||||||
reasonable_max = limit_by_allocatable_memory(reasonable_max);
|
reasonable_max = limit_by_allocatable_memory(reasonable_max);
|
||||||
|
|
||||||
if (!FLAG_IS_DEFAULT(InitialHeapSize)) {
|
if (!FLAG_IS_DEFAULT(InitialHeapSize)) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user