src/hotspot/share/memory/universe.cpp

*** 60,70 ****
  #include "oops/oop.inline.hpp"
  #include "oops/typeArrayKlass.hpp"
  #include "prims/resolvedMethodTable.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/atomic.hpp"
! #include "runtime/commandLineFlagConstraintList.hpp"
  #include "runtime/deoptimization.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/init.hpp"
  #include "runtime/java.hpp"
  #include "runtime/javaCalls.hpp"
--- 60,71 ----
  #include "oops/oop.inline.hpp"
  #include "oops/typeArrayKlass.hpp"
  #include "prims/resolvedMethodTable.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/atomic.hpp"
! #include "runtime/flags/flagSetting.hpp"
! #include "runtime/flags/jvmFlagConstraintList.hpp"
  #include "runtime/deoptimization.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/init.hpp"
  #include "runtime/java.hpp"
  #include "runtime/javaCalls.hpp"
*** 696,706 ****
    CompressedClassSpaceCounters::initialize_performance_counters();
  
    AOTLoader::universe_init();
  
    // Checks 'AfterMemoryInit' constraints.
!   if (!CommandLineFlagConstraintList::check_constraints(CommandLineFlagConstraint::AfterMemoryInit)) {
      return JNI_EINVAL;
    }
  
    // Create memory for metadata.  Must be after initializing heap for
    // DumpSharedSpaces.
--- 697,707 ----
    CompressedClassSpaceCounters::initialize_performance_counters();
  
    AOTLoader::universe_init();
  
    // Checks 'AfterMemoryInit' constraints.
!   if (!JVMFlagConstraintList::check_constraints(JVMFlagConstraint::AfterMemoryInit)) {
      return JNI_EINVAL;
    }
  
    // Create memory for metadata.  Must be after initializing heap for
    // DumpSharedSpaces.