src/share/vm/runtime/synchronizer.cpp

@@ -157,11 +157,11 @@
 
 bool ObjectSynchronizer::quick_notify(oopDesc * obj, Thread * self, bool all) {
   assert(!SafepointSynchronize::is_at_safepoint(), "invariant");
   assert(self->is_Java_thread(), "invariant");
   assert(((JavaThread *) self)->thread_state() == _thread_in_Java, "invariant");
-  No_Safepoint_Verifier nsv;
+  NoSafepointVerifier nsv;
   if (obj == NULL) return false;  // slow-path for invalid obj
   const markOop mark = obj->mark();
 
   if (mark->has_locker() && self->is_lock_owned((address)mark->locker())) {
     // Degenerate notify

@@ -207,11 +207,11 @@
 bool ObjectSynchronizer::quick_enter(oop obj, Thread * Self,
                                      BasicLock * Lock) {
   assert(!SafepointSynchronize::is_at_safepoint(), "invariant");
   assert(Self->is_Java_thread(), "invariant");
   assert(((JavaThread *) Self)->thread_state() == _thread_in_Java, "invariant");
-  No_Safepoint_Verifier nsv;
+  NoSafepointVerifier nsv;
   if (obj == NULL) return false;       // Need to throw NPE
   const markOop mark = obj->mark();
 
   if (mark->has_monitor()) {
     ObjectMonitor * const m = mark->monitor();

@@ -1732,11 +1732,11 @@
 // Since the tests are extremely cheap we could leave them enabled
 // for normal product builds.
 
 void ObjectSynchronizer::release_monitors_owned_by_thread(TRAPS) {
   assert(THREAD == JavaThread::current(), "must be current Java thread");
-  No_Safepoint_Verifier nsv;
+  NoSafepointVerifier nsv;
   ReleaseJavaMonitorsClosure rjmc(THREAD);
   Thread::muxAcquire(&gListLock, "release_monitors_owned_by_thread");
   ObjectSynchronizer::monitors_iterate(&rjmc);
   Thread::muxRelease(&gListLock);
   THREAD->clear_pending_exception();