8017483: G1 tests fail with native OOME on Solaris x86 after HeapBaseMinAddress has been increased

Summary: Set HeapBaseMinAddress as default rather than ergo
Reviewed-by: stefank, jmasa, kvn

--HG--
extra : rebase_source : dc9653b519a6642d0fc681259f55aac29b8f2464

1 files changed, 3 insertions, 1 deletions

diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
index 625feda03..3fc9761f7 100644
--- a/src/share/vm/runtime/arguments.cpp
+++ b/src/share/vm/runtime/arguments.cpp
@@ -1571,7 +1571,9 @@ void Arguments::set_heap_base_min_address() {
     // 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.
-    FLAG_SET_ERGO(uintx, HeapBaseMinAddress, 1*G);
+    // 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);
   }
 }