diff -r 663c609dfeee -r c8c0273e6b91 hotspot/src/share/vm/ci/ciEnv.cpp
--- a/hotspot/src/share/vm/ci/ciEnv.cpp	Thu Jan 14 09:18:11 2016 +0100
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp	Thu Jan 14 13:26:19 2016 +0100
@@ -971,7 +971,7 @@
     // and invalidating our dependencies until we install this method.
     // No safepoints are allowed. Otherwise, class redefinition can occur in between.
     MutexLocker ml(Compile_lock);
-    No_Safepoint_Verifier nsv;
+    NoSafepointVerifier nsv;
 
     // Change in Jvmti state may invalidate compilation.
     if (!failing() && jvmti_state_changed()) {