# HG changeset patch
# User ehelin
# Date 1372436897 -7200
# Node ID 3ea89789ba3991a20cea17e3d3e7dac9de738620
# Parent  c92b74c62d97803cf445933555cb5a5da6d7f202# Parent  be0600ec1102819bef708e3d7ef07d5b4fc8c4ee
Merge

diff -r be0600ec1102 -r 3ea89789ba39 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Thu Jun 27 11:12:19 2013 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Fri Jun 28 18:28:17 2013 +0200
@@ -1571,7 +1571,9 @@
     // 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);
   }
 }