diff -r 663c609dfeee -r c8c0273e6b91 hotspot/src/share/vm/classfile/stringTable.cpp
--- a/hotspot/src/share/vm/classfile/stringTable.cpp	Thu Jan 14 09:18:11 2016 +0100
+++ b/hotspot/src/share/vm/classfile/stringTable.cpp	Thu Jan 14 13:26:19 2016 +0100
@@ -136,7 +136,7 @@
   assert(java_lang_String::equals(string(), name, len),
          "string must be properly initialized");
   // Cannot hit a safepoint in this function because the "this" pointer can move.
-  No_Safepoint_Verifier nsv;
+  NoSafepointVerifier nsv;
 
   // Check if the symbol table has been rehashed, if so, need to recalculate
   // the hash value and index before second lookup.