Mercurial > hg > graal-compiler
changeset 12181:428025878417
Merge
author | jmasa |
---|---|
date | Wed, 04 Sep 2013 12:56:03 -0700 |
parents | a701c16e8bbf (diff) f175e3678be2 (current diff) |
children | bb57d48691f5 |
files | |
diffstat | 3 files changed, 1 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp Thu Aug 22 11:23:15 2013 +0200 +++ b/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp Wed Sep 04 12:56:03 2013 -0700 @@ -44,6 +44,6 @@ define_pd_global(intx, CompilerThreadStackSize, 0); // Used on 64 bit platforms for UseCompressedOops base address -define_pd_global(uintx,HeapBaseMinAddress, 256*M); +define_pd_global(uintx,HeapBaseMinAddress, 2*G); #endif // OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP
--- a/src/share/vm/runtime/arguments.cpp Thu Aug 22 11:23:15 2013 +0200 +++ b/src/share/vm/runtime/arguments.cpp Wed Sep 04 12:56:03 2013 -0700 @@ -1605,17 +1605,6 @@ return result; } -void Arguments::set_heap_base_min_address() { - if (FLAG_IS_DEFAULT(HeapBaseMinAddress) && UseG1GC && HeapBaseMinAddress < 1*G) { - // By default HeapBaseMinAddress is 2G on all platforms except Solaris x86. - // G1 currently needs a lot of C-heap, so on Solaris we have to give G1 - // some extra space for the C-heap compared to other collectors. - // Use FLAG_SET_DEFAULT here rather than FLAG_SET_ERGO to make sure that - // code that checks for default values work correctly. - FLAG_SET_DEFAULT(HeapBaseMinAddress, 1*G); - } -} - void Arguments::set_heap_size() { if (!FLAG_IS_DEFAULT(DefaultMaxRAMFraction)) { // Deprecated flag @@ -3537,8 +3526,6 @@ } } - set_heap_base_min_address(); - // Set heap size based on available physical memory set_heap_size();
--- a/src/share/vm/runtime/arguments.hpp Thu Aug 22 11:23:15 2013 +0200 +++ b/src/share/vm/runtime/arguments.hpp Wed Sep 04 12:56:03 2013 -0700 @@ -315,8 +315,6 @@ // limits the given memory size by the maximum amount of memory this process is // currently allowed to allocate or reserve. static julong limit_by_allocatable_memory(julong size); - // Setup HeapBaseMinAddress - static void set_heap_base_min_address(); // Setup heap size static void set_heap_size(); // Based on automatic selection criteria, should the