--- a/hotspot/src/share/vm/prims/jni.cpp	Wed Jun 28 20:21:04 2017 +0000
+++ b/hotspot/src/share/vm/prims/jni.cpp	Wed Jun 28 19:12:58 2017 -0400
@@ -84,6 +84,7 @@
 #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
@@ -3983,7 +3984,7 @@
 
     // Some platforms (like Win*) need a wrapper around these test
     // functions in order to properly handle error conditions.
-    test_error_handler();
+    VMError::test_error_handler();
     if (ExecuteInternalVMTests) {
       InternalVMTests::run();
     }