src/share/vm/prims/jni.cpp

*** 82,91 ****
--- 82,92 ----
  #include "utilities/dtrace.hpp"
  #include "utilities/events.hpp"
  #include "utilities/histogram.hpp"
  #include "utilities/internalVMTests.hpp"
  #include "utilities/macros.hpp"
+ #include "utilities/vmError.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #endif // INCLUDE_ALL_GCS
  #if INCLUDE_JVMCI
  #include "jvmci/jvmciCompiler.hpp"
*** 3981,3991 ****
      if (CompileTheWorld) ClassLoader::compile_the_world();
      if (ReplayCompiles) ciReplay::replay(thread);
  
      // Some platforms (like Win*) need a wrapper around these test
      // functions in order to properly handle error conditions.
!     test_error_handler();
      if (ExecuteInternalVMTests) {
        InternalVMTests::run();
      }
  #endif
  
--- 3982,3992 ----
      if (CompileTheWorld) ClassLoader::compile_the_world();
      if (ReplayCompiles) ciReplay::replay(thread);
  
      // Some platforms (like Win*) need a wrapper around these test
      // functions in order to properly handle error conditions.
!     VMError::test_error_handler();
      if (ExecuteInternalVMTests) {
        InternalVMTests::run();
      }
  #endif