*** old/src/share/vm/runtime/thread.cpp	Wed May 27 10:37:44 2015
--- new/src/share/vm/runtime/thread.cpp	Wed May 27 10:37:43 2015

*** 51,60 ****
--- 51,61 ----
  #include "runtime/atomic.inline.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/deoptimization.hpp"
  #include "runtime/fprofiler.hpp"
  #include "runtime/frame.inline.hpp"
+ #include "runtime/globals.hpp"
  #include "runtime/init.hpp"
  #include "runtime/interfaceSupport.hpp"
  #include "runtime/java.hpp"
  #include "runtime/javaCalls.hpp"
  #include "runtime/jniPeriodicChecker.hpp"

*** 3300,3309 ****
--- 3301,3315 ----
    os::init_before_ergo();
  
    jint ergo_result = Arguments::apply_ergo();
    if (ergo_result != JNI_OK) return ergo_result;
  
+   // Final check of all arguments after ergonomics which may change values.
+   if (!CommandLineFlags::check_all_ranges_and_constraints()) {
+     return JNI_EINVAL;
+   }
+ 
    if (PauseAtStartup) {
      os::pause();
    }
  
    HOTSPOT_VM_INIT_BEGIN();