src/share/vm/runtime/arguments.cpp

*** 1406,1416 ****
    // We need to fit both the NULL page and the heap into the memory budget, while
    // keeping alignment constraints of the heap. To guarantee the latter, as the
    // NULL page is located before the heap, we pad the NULL page to the conservative
    // maximum alignment that the GC may ever impose upon the heap.
    size_t displacement_due_to_null_page = align_size_up_(os::vm_page_size(),
!     Arguments::conservative_max_heap_alignment());
  
    LP64_ONLY(return OopEncodingHeapMax - displacement_due_to_null_page);
    NOT_LP64(ShouldNotReachHere(); return 0);
  }
  
--- 1406,1416 ----
    // We need to fit both the NULL page and the heap into the memory budget, while
    // keeping alignment constraints of the heap. To guarantee the latter, as the
    // NULL page is located before the heap, we pad the NULL page to the conservative
    // maximum alignment that the GC may ever impose upon the heap.
    size_t displacement_due_to_null_page = align_size_up_(os::vm_page_size(),
!                                                         _conservative_max_heap_alignment);
  
    LP64_ONLY(return OopEncodingHeapMax - displacement_due_to_null_page);
    NOT_LP64(ShouldNotReachHere(); return 0);
  }
  
*** 2676,2688 ****
          jio_fprintf(defaultStream::error_stream(),
                      "Invalid initial heap size: %s\n", option->optionString);
          describe_range_error(errcode);
          return JNI_EINVAL;
        }
!       FLAG_SET_CMDLINE(uintx, InitialHeapSize, (uintx)long_initial_heap_size);
        // Currently the minimum size and the initial heap sizes are the same.
!       set_min_heap_size(InitialHeapSize);
      // -Xmx
      } else if (match_option(option, "-Xmx", &tail) || match_option(option, "-XX:MaxHeapSize=", &tail)) {
        julong long_max_heap_size = 0;
        ArgsRange errcode = parse_memory_size(tail, &long_max_heap_size, 1);
        if (errcode != arg_in_range) {
--- 2676,2689 ----
          jio_fprintf(defaultStream::error_stream(),
                      "Invalid initial heap size: %s\n", option->optionString);
          describe_range_error(errcode);
          return JNI_EINVAL;
        }
!       set_min_heap_size((uintx)long_initial_heap_size);
        // Currently the minimum size and the initial heap sizes are the same.
!       // Can be overridden with -XX:InitialHeapSize.
!       FLAG_SET_CMDLINE(uintx, InitialHeapSize, (uintx)long_initial_heap_size);
      // -Xmx
      } else if (match_option(option, "-Xmx", &tail) || match_option(option, "-XX:MaxHeapSize=", &tail)) {
        julong long_max_heap_size = 0;
        ArgsRange errcode = parse_memory_size(tail, &long_max_heap_size, 1);
        if (errcode != arg_in_range) {