src/share/vm/runtime/arguments.cpp

*** 1206,1218 ****
        tty->print_cr("CMS ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize);
      }
  
      // Code along this path potentially sets NewSize and OldSize
  
-     assert(max_heap >= InitialHeapSize, "Error");
-     assert(max_heap >= NewSize, "Error");
- 
      if (PrintGCDetails && Verbose) {
        // Too early to use gclog_or_tty
        tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT
             " initial_heap_size:  " SIZE_FORMAT
             " max_heap: " SIZE_FORMAT,
--- 1206,1215 ----
*** 2340,2350 ****
          return JNI_EINVAL;
        }
        FLAG_SET_CMDLINE(uintx, MaxNewSize, (uintx)long_initial_eden_size);
        FLAG_SET_CMDLINE(uintx, NewSize, (uintx)long_initial_eden_size);
      // -Xms
!     } else if (match_option(option, "-Xms", &tail)) {
        julong long_initial_heap_size = 0;
        ArgsRange errcode = parse_memory_size(tail, &long_initial_heap_size, 1);
        if (errcode != arg_in_range) {
          jio_fprintf(defaultStream::error_stream(),
                      "Invalid initial heap size: %s\n", option->optionString);
--- 2337,2347 ----
          return JNI_EINVAL;
        }
        FLAG_SET_CMDLINE(uintx, MaxNewSize, (uintx)long_initial_eden_size);
        FLAG_SET_CMDLINE(uintx, NewSize, (uintx)long_initial_eden_size);
      // -Xms
!     } else if (match_option(option, "-Xms", &tail) || match_option(option, "-XX:InitialHeapSize=", &tail)) {
        julong long_initial_heap_size = 0;
        ArgsRange errcode = parse_memory_size(tail, &long_initial_heap_size, 1);
        if (errcode != arg_in_range) {
          jio_fprintf(defaultStream::error_stream(),
                      "Invalid initial heap size: %s\n", option->optionString);
*** 2353,2363 ****
        }
        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)) {
        julong long_max_heap_size = 0;
        ArgsRange errcode = parse_memory_size(tail, &long_max_heap_size, 1);
        if (errcode != arg_in_range) {
          jio_fprintf(defaultStream::error_stream(),
                      "Invalid maximum heap size: %s\n", option->optionString);
--- 2350,2360 ----
        }
        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) {
          jio_fprintf(defaultStream::error_stream(),
                      "Invalid maximum heap size: %s\n", option->optionString);