src/hotspot/share/runtime/arguments.cpp

*** 27,41 ****
  #include "classfile/classLoader.hpp"
  #include "classfile/javaAssertions.hpp"
  #include "classfile/moduleEntry.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/symbolTable.hpp"
  #include "gc/shared/gcArguments.hpp"
  #include "gc/shared/gcConfig.hpp"
- #include "gc/shared/genCollectedHeap.hpp"
- #include "gc/shared/referenceProcessor.hpp"
- #include "gc/shared/taskqueue.hpp"
  #include "logging/log.hpp"
  #include "logging/logConfiguration.hpp"
  #include "logging/logStream.hpp"
  #include "logging/logTag.hpp"
  #include "memory/allocation.inline.hpp"
--- 27,39 ----
  #include "classfile/classLoader.hpp"
  #include "classfile/javaAssertions.hpp"
  #include "classfile/moduleEntry.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/symbolTable.hpp"
+ #include "gc/shared/collectorPolicy.hpp"
  #include "gc/shared/gcArguments.hpp"
  #include "gc/shared/gcConfig.hpp"
  #include "logging/log.hpp"
  #include "logging/logConfiguration.hpp"
  #include "logging/logStream.hpp"
  #include "logging/logTag.hpp"
  #include "memory/allocation.inline.hpp"
*** 2188,2232 ****
                  "not " SIZE_FORMAT "\n",
                  TLABRefillWasteFraction);
      status = false;
    }
  
-   if (FullGCALot && FLAG_IS_DEFAULT(MarkSweepAlwaysCompactCount)) {
-     MarkSweepAlwaysCompactCount = 1;  // Move objects every gc.
-   }
- 
-   if (!(UseParallelGC || UseParallelOldGC) && FLAG_IS_DEFAULT(ScavengeBeforeFullGC)) {
-     FLAG_SET_DEFAULT(ScavengeBeforeFullGC, false);
-   }
- 
-   if (GCTimeLimit == 100) {
-     // Turn off gc-overhead-limit-exceeded checks
-     FLAG_SET_DEFAULT(UseGCOverheadLimit, false);
-   }
- 
-   // CMS space iteration, which FLSVerifyAllHeapreferences entails,
-   // insists that we hold the requisite locks so that the iteration is
-   // MT-safe. For the verification at start-up and shut-down, we don't
-   // yet have a good way of acquiring and releasing these locks,
-   // which are not visible at the CollectedHeap level. We want to
-   // be able to acquire these locks and then do the iteration rather
-   // than just disable the lock verification. This will be fixed under
-   // bug 4788986.
-   if (UseConcMarkSweepGC && FLSVerifyAllHeapReferences) {
-     if (VerifyDuringStartup) {
-       warning("Heap verification at start-up disabled "
-               "(due to current incompatibility with FLSVerifyAllHeapReferences)");
-       VerifyDuringStartup = false; // Disable verification at start-up
-     }
- 
-     if (VerifyBeforeExit) {
-       warning("Heap verification at shutdown disabled "
-               "(due to current incompatibility with FLSVerifyAllHeapReferences)");
-       VerifyBeforeExit = false; // Disable verification at shutdown
-     }
-   }
- 
    if (PrintNMTStatistics) {
  #if INCLUDE_NMT
      if (MemTracker::tracking_level() == NMT_off) {
  #endif // INCLUDE_NMT
        warning("PrintNMTStatistics is disabled, because native memory tracking is not enabled");
--- 2186,2195 ----