src/share/vm/memory/collectorPolicy.cpp

*** 390,400 ****
        // Somebody has set a maximum heap size with the intention that we should not
        // exceed it. Adjust New/OldSize as necessary.
        uintx calculated_size = NewSize + OldSize;
        double shrink_factor = (double) MaxHeapSize / calculated_size;
        uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment);
!       FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(), smaller_new_size));
        _initial_gen0_size = NewSize;
  
        // OldSize is already aligned because above we aligned MaxHeapSize to
        // _heap_alignment, and we just made sure that NewSize is aligned to
        // _gen_alignment. In initialize_flags() we verified that _heap_alignment
--- 390,400 ----
        // Somebody has set a maximum heap size with the intention that we should not
        // exceed it. Adjust New/OldSize as necessary.
        uintx calculated_size = NewSize + OldSize;
        double shrink_factor = (double) MaxHeapSize / calculated_size;
        uintx smaller_new_size = align_size_down((uintx)(NewSize * shrink_factor), _gen_alignment);
!       FLAG_SET_ERGO(uintx, NewSize, MAX2(young_gen_size_lower_bound(), (size_t)smaller_new_size));
        _initial_gen0_size = NewSize;
  
        // OldSize is already aligned because above we aligned MaxHeapSize to
        // _heap_alignment, and we just made sure that NewSize is aligned to
        // _gen_alignment. In initialize_flags() we verified that _heap_alignment
*** 459,469 ****
      // Bound the maximum size by NewSize below (since it historically
      // would have been NewSize and because the NewRatio calculation could
      // yield a size that is too small) and bound it by MaxNewSize above.
      // Ergonomics plays here by previously calculating the desired
      // NewSize and MaxNewSize.
!     max_new_size = MIN2(MAX2(max_new_size, NewSize), MaxNewSize);
    }
    assert(max_new_size > 0, "All paths should set max_new_size");
  
    // Given the maximum gen0 size, determine the initial and
    // minimum gen0 sizes.
--- 459,469 ----
      // Bound the maximum size by NewSize below (since it historically
      // would have been NewSize and because the NewRatio calculation could
      // yield a size that is too small) and bound it by MaxNewSize above.
      // Ergonomics plays here by previously calculating the desired
      // NewSize and MaxNewSize.
!     max_new_size = MIN2(MAX2(max_new_size, (size_t)NewSize), (size_t)MaxNewSize);
    }
    assert(max_new_size > 0, "All paths should set max_new_size");
  
    // Given the maximum gen0 size, determine the initial and
    // minimum gen0 sizes.
*** 493,503 ****
        // For the case where NewSize is not set on the command line, use
        // NewRatio to size the initial generation size. Use the current
        // NewSize as the floor, because if NewRatio is overly large, the resulting
        // size can be too small.
        desired_new_size =
!         MIN2(max_new_size, MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), NewSize));
      }
      _initial_gen0_size = desired_new_size;
      _max_gen0_size = max_new_size;
    }
  
--- 493,503 ----
        // For the case where NewSize is not set on the command line, use
        // NewRatio to size the initial generation size. Use the current
        // NewSize as the floor, because if NewRatio is overly large, the resulting
        // size can be too small.
        desired_new_size =
!         MIN2(max_new_size, MAX2(scale_by_NewRatio_aligned(_initial_heap_byte_size), (size_t)NewSize));
      }
      _initial_gen0_size = desired_new_size;
      _max_gen0_size = max_new_size;
    }
  
*** 549,559 ****
            " -XX:OldSize flag is being ignored",
            _max_heap_byte_size);
        FLAG_SET_ERGO(uintx, OldSize, _max_gen1_size);
      }
  
!     _min_gen1_size = MIN2(OldSize, _min_heap_byte_size - _min_gen0_size);
      _initial_gen1_size = OldSize;
    }
  
    // The initial generation sizes should match the initial heap size,
    // if not issue a warning and resize the generations. This behavior
--- 549,559 ----
            " -XX:OldSize flag is being ignored",
            _max_heap_byte_size);
        FLAG_SET_ERGO(uintx, OldSize, _max_gen1_size);
      }
  
!     _min_gen1_size = MIN2((size_t)OldSize, _min_heap_byte_size - _min_gen0_size);
      _initial_gen1_size = OldSize;
    }
  
    // The initial generation sizes should match the initial heap size,
    // if not issue a warning and resize the generations. This behavior