src/share/vm/runtime/arguments.cpp

*** 1304,1314 ****
    // with YoungPLABSize and OldPLABSize options.
    // See CR 6362902.
    if (!FLAG_IS_DEFAULT(OldPLABSize)) {
      if (FLAG_IS_DEFAULT(CMSParPromoteBlocksToClaim)) {
        // OldPLABSize is not the default value but CMSParPromoteBlocksToClaim
!       // is.  In this situtation let CMSParPromoteBlocksToClaim follow
        // the value (either from the command line or ergonomics) of
        // OldPLABSize.  Following OldPLABSize is an ergonomics decision.
        FLAG_SET_ERGO(uintx, CMSParPromoteBlocksToClaim, OldPLABSize);
      } else {
        // OldPLABSize and CMSParPromoteBlocksToClaim are both set.
--- 1304,1314 ----
    // with YoungPLABSize and OldPLABSize options.
    // See CR 6362902.
    if (!FLAG_IS_DEFAULT(OldPLABSize)) {
      if (FLAG_IS_DEFAULT(CMSParPromoteBlocksToClaim)) {
        // OldPLABSize is not the default value but CMSParPromoteBlocksToClaim
!       // is.  In this situation let CMSParPromoteBlocksToClaim follow
        // the value (either from the command line or ergonomics) of
        // OldPLABSize.  Following OldPLABSize is an ergonomics decision.
        FLAG_SET_ERGO(uintx, CMSParPromoteBlocksToClaim, OldPLABSize);
      } else {
        // OldPLABSize and CMSParPromoteBlocksToClaim are both set.
*** 2645,2664 ****
      // -Xbatch
      } else if (match_option(option, "-Xbatch", &tail)) {
        FLAG_SET_CMDLINE(bool, BackgroundCompilation, false);
      // -Xmn for compatibility with other JVM vendors
      } else if (match_option(option, "-Xmn", &tail)) {
!       julong long_initial_eden_size = 0;
!       ArgsRange errcode = parse_memory_size(tail, &long_initial_eden_size, 1);
        if (errcode != arg_in_range) {
          jio_fprintf(defaultStream::error_stream(),
!                     "Invalid initial eden size: %s\n", option->optionString);
          describe_range_error(errcode);
          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;
        // an initial heap size of 0 means automatically determine
        ArgsRange errcode = parse_memory_size(tail, &long_initial_heap_size, 0);
--- 2645,2664 ----
      // -Xbatch
      } else if (match_option(option, "-Xbatch", &tail)) {
        FLAG_SET_CMDLINE(bool, BackgroundCompilation, false);
      // -Xmn for compatibility with other JVM vendors
      } else if (match_option(option, "-Xmn", &tail)) {
!       julong long_initial_young_size = 0;
!       ArgsRange errcode = parse_memory_size(tail, &long_initial_young_size, 1);
        if (errcode != arg_in_range) {
          jio_fprintf(defaultStream::error_stream(),
!                     "Invalid initial young generation size: %s\n", option->optionString);
          describe_range_error(errcode);
          return JNI_EINVAL;
        }
!       FLAG_SET_CMDLINE(uintx, MaxNewSize, (uintx)long_initial_young_size);
!       FLAG_SET_CMDLINE(uintx, NewSize, (uintx)long_initial_young_size);
      // -Xms
      } else if (match_option(option, "-Xms", &tail)) {
        julong long_initial_heap_size = 0;
        // an initial heap size of 0 means automatically determine
        ArgsRange errcode = parse_memory_size(tail, &long_initial_heap_size, 0);