Merge

hotspot/src/share/vm/runtime/globals.hpp

@@ -3563,7 +3563,7 @@ public:
                                                                             \
   product_pd(intx, CompilerThreadStackSize,                                 \
           "Compiler Thread Stack Size (in Kbytes)")                         \
-          range(0, max_intx)                                                \
+          range(0, max_intx /(1 * K))                                       \
                                                                             \
   develop_pd(size_t, JVMInvokeMethodSlack,                                  \
           "Stack space (bytes) required for JVM_InvokeMethod to complete")  \

hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java

@@ -58,6 +58,13 @@ public class TestOptionsWithRanges {
         */
         allOptionsAsMap.remove("ThreadStackSize");
 
+        /*
+         * Remove the flag controlling the size of the stack because the
+         * flag has direct influence on the physical memory usage of
+         * the VM.
+         */
+        allOptionsAsMap.remove("CompilerThreadStackSize");
+
         /*
          * Exclude MallocMaxTestWords as it is expected to exit VM at small values (>=0)
          */