src/hotspot/share/runtime/commandLineFlagConstraintsGC.cpp

*** 21,32 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/shared/collectedHeap.hpp"
! #include "gc/shared/collectorPolicy.hpp"
  #include "gc/shared/genCollectedHeap.hpp"
  #include "gc/shared/threadLocalAllocBuffer.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/commandLineFlagConstraintsGC.hpp"
  #include "runtime/commandLineFlagRangeList.hpp"
--- 21,33 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "gc/shared/cardTableRS.hpp"
  #include "gc/shared/collectedHeap.hpp"
! #include "gc/shared/gcArguments.hpp"
  #include "gc/shared/genCollectedHeap.hpp"
  #include "gc/shared/threadLocalAllocBuffer.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/commandLineFlagConstraintsGC.hpp"
  #include "runtime/commandLineFlagRangeList.hpp"
*** 640,650 ****
    if (UseG1GC) {
      heap_alignment = HeapRegionBounds::max_size();
    } else
  #endif
    {
!     heap_alignment = CollectorPolicy::compute_heap_alignment();
    }
  
    return MaxSizeForAlignment(name, value, heap_alignment, verbose);
  }
  
--- 641,651 ----
    if (UseG1GC) {
      heap_alignment = HeapRegionBounds::max_size();
    } else
  #endif
    {
!     heap_alignment = compute_heap_alignment();
    }
  
    return MaxSizeForAlignment(name, value, heap_alignment, verbose);
  }
  
*** 751,766 ****
    return Flag::SUCCESS;
  }
  
  Flag::Error SurvivorRatioConstraintFunc(uintx value, bool verbose) {
    if (FLAG_IS_CMDLINE(SurvivorRatio) &&
!       (value > (MaxHeapSize / Universe::heap()->collector_policy()->space_alignment()))) {
      CommandLineError::print(verbose,
                              "SurvivorRatio (" UINTX_FORMAT ") must be "
                              "less than or equal to ergonomic SurvivorRatio maximum (" SIZE_FORMAT ")\n",
                              value,
!                             (MaxHeapSize / Universe::heap()->collector_policy()->space_alignment()));
      return Flag::VIOLATES_CONSTRAINT;
    } else {
      return Flag::SUCCESS;
    }
  }
--- 752,767 ----
    return Flag::SUCCESS;
  }
  
  Flag::Error SurvivorRatioConstraintFunc(uintx value, bool verbose) {
    if (FLAG_IS_CMDLINE(SurvivorRatio) &&
!       (value > (MaxHeapSize / Universe::heap()->space_alignment()))) {
      CommandLineError::print(verbose,
                              "SurvivorRatio (" UINTX_FORMAT ") must be "
                              "less than or equal to ergonomic SurvivorRatio maximum (" SIZE_FORMAT ")\n",
                              value,
!                             (MaxHeapSize / Universe::heap()->space_alignment()));
      return Flag::VIOLATES_CONSTRAINT;
    } else {
      return Flag::SUCCESS;
    }
  }