*** old/src/hotspot/share/runtime/thread.cpp	Thu Mar 29 13:44:17 2018
--- new/src/hotspot/share/runtime/thread.cpp	Thu Mar 29 13:44:17 2018

*** 60,75 ****
--- 60,74 ----
  #include "prims/jvmtiThreadState.hpp"
  #include "prims/privilegedStack.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/atomic.hpp"
  #include "runtime/biasedLocking.hpp"
! #include "runtime/commandLineFlagConstraintList.hpp"
! #include "runtime/commandLineFlagWriteableList.hpp"
! #include "runtime/commandLineFlagRangeList.hpp"
! #include "runtime/jvmFlagConstraintList.hpp"
! #include "runtime/jvmFlagWriteableList.hpp"
! #include "runtime/jvmFlagRangeList.hpp"
  #include "runtime/deoptimization.hpp"
  #include "runtime/frame.inline.hpp"
  #include "runtime/globals.hpp"
  #include "runtime/handshake.hpp"
  #include "runtime/init.hpp"
  #include "runtime/interfaceSupport.inline.hpp"
  #include "runtime/java.hpp"
  #include "runtime/javaCalls.hpp"

*** 3636,3656 ****
--- 3635,3655 ----
  
    jint ergo_result = Arguments::apply_ergo();
    if (ergo_result != JNI_OK) return ergo_result;
  
    // Final check of all ranges after ergonomics which may change values.
!   if (!CommandLineFlagRangeList::check_ranges()) {
!   if (!JVMFlagRangeList::check_ranges()) {
      return JNI_EINVAL;
    }
  
    // Final check of all 'AfterErgo' constraints after ergonomics which may change values.
!   bool constraint_result = CommandLineFlagConstraintList::check_constraints(CommandLineFlagConstraint::AfterErgo);
!   bool constraint_result = JVMFlagConstraintList::check_constraints(JVMFlagConstraint::AfterErgo);
    if (!constraint_result) {
      return JNI_EINVAL;
    }
  
!   CommandLineFlagWriteableList::mark_startup();
!   JVMFlagWriteableList::mark_startup();
  
    if (PauseAtStartup) {
      os::pause();
    }