--- a/hotspot/src/share/vm/runtime/deoptimization.cpp	Mon Jan 04 15:41:05 2016 +0100
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp	Thu Jan 14 16:26:38 2016 -0500
@@ -297,7 +297,7 @@
   // Ensure that no safepoint is taken after pointers have been stored
   // in fields of rematerialized objects.  If a safepoint occurs from here on
   // out the java state residing in the vframeArray will be missed.
-  No_Safepoint_Verifier no_safepoint;
+  NoSafepointVerifier no_safepoint;
 
   vframeArray* array = create_vframeArray(thread, deoptee, &map, chunk, realloc_failures);
 #if defined(COMPILER2) || INCLUDE_JVMCI