src/share/vm/interpreter/oopMapCache.cpp

@@ -437,11 +437,11 @@
          ^ ((unsigned int) method->size_of_parameters() << 6);
 }
 
 
 OopMapCache::OopMapCache() :
-  _mut(Mutex::leaf, "An OopMapCache lock", true)
+  _mut(Mutex::leaf, "An OopMapCache lock", true, Monitor::_safepoint_check_never)
 {
   _array  = NEW_C_HEAP_ARRAY(OopMapCacheEntry, _size, mtClass);
   // Cannot call flush for initialization, since flush
   // will check if memory should be deallocated
   for(int i = 0; i < _size; i++) _array[i].initialize();

@@ -482,11 +482,11 @@
 }
 
 void OopMapCache::lookup(const methodHandle& method,
                          int bci,
                          InterpreterOopMap* entry_for) const {
-  MutexLocker x(&_mut);
+  MutexLockerEx x(&_mut, Mutex::_no_safepoint_check_flag);
 
   OopMapCacheEntry* entry = NULL;
   int probe = hash_value_for(method, bci);
 
   // Search hashtable for match