diff -r 663c609dfeee -r c8c0273e6b91 hotspot/src/share/vm/prims/methodHandles.cpp
--- a/hotspot/src/share/vm/prims/methodHandles.cpp	Thu Jan 14 09:18:11 2016 +0100
+++ b/hotspot/src/share/vm/prims/methodHandles.cpp	Thu Jan 14 13:26:19 2016 +0100
@@ -981,7 +981,7 @@
   int marked = 0;
   CallSiteDepChange changes(call_site(), target());
   {
-    No_Safepoint_Verifier nsv;
+    NoSafepointVerifier nsv;
     MutexLockerEx mu2(CodeCache_lock, Mutex::_no_safepoint_check_flag);
 
     oop context = java_lang_invoke_CallSite::context(call_site());
@@ -1339,7 +1339,7 @@
 
     int marked = 0;
     {
-      No_Safepoint_Verifier nsv;
+      NoSafepointVerifier nsv;
       MutexLockerEx mu2(CodeCache_lock, Mutex::_no_safepoint_check_flag);
       assert(safe_to_expunge(), "removal is not safe");
       DependencyContext deps = java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(context());