--- old/src/share/vm/oops/instanceKlass.cpp	2017-06-26 12:31:39.074238537 -0400
+++ new/src/share/vm/oops/instanceKlass.cpp	2017-06-26 12:31:38.438235383 -0400
@@ -1212,7 +1212,7 @@
   OopMapCache* oop_map_cache =
       static_cast<OopMapCache*>(OrderAccess::load_ptr_acquire(&_oop_map_cache));
   if (oop_map_cache == NULL) {
-    MutexLocker x(OopMapCacheAlloc_lock);
+    MutexLockerEx x(OopMapCacheAlloc_lock,  Mutex::_no_safepoint_check_flag);
     // Check if _oop_map_cache was allocated while we were waiting for this lock
     if ((oop_map_cache = _oop_map_cache) == NULL) {
       oop_map_cache = new OopMapCache();