--- old/src/hotspot/share/memory/universe.cpp	2020-04-05 21:35:18.330963518 -0700
+++ new/src/hotspot/share/memory/universe.cpp	2020-04-05 21:35:17.982950418 -0700
@@ -64,7 +64,6 @@
 #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"
@@ -670,7 +669,7 @@
   AOTLoader::universe_init();
 
   // Checks 'AfterMemoryInit' constraints.
-  if (!JVMFlagConstraintList::check_constraints(JVMFlagConstraint::AfterMemoryInit)) {
+  if (!JVMFlag::check_all_constraints(JVMFlag::AfterMemoryInit)) {
     return JNI_EINVAL;
   }