src/hotspot/share/memory/universe.cpp

*** 62,72 ****
  #include "prims/resolvedMethodTable.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/atomic.hpp"
  #include "runtime/deoptimization.hpp"
  #include "runtime/flags/flagSetting.hpp"
- #include "runtime/flags/jvmFlagConstraintList.hpp"
  #include "runtime/handles.inline.hpp"
  #include "runtime/init.hpp"
  #include "runtime/java.hpp"
  #include "runtime/javaCalls.hpp"
  #include "runtime/sharedRuntime.hpp"
--- 62,71 ----
*** 668,678 ****
    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.
--- 667,677 ----
    CompressedClassSpaceCounters::initialize_performance_counters();
  
    AOTLoader::universe_init();
  
    // Checks 'AfterMemoryInit' constraints.
!   if (!JVMFlag::check_all_constraints(JVMFlag::AfterMemoryInit)) {
      return JNI_EINVAL;
    }
  
    // Create memory for metadata.  Must be after initializing heap for
    // DumpSharedSpaces.