jdk-sandbox: comparison src/hotspot/share/code/nmethod.cpp

equal deleted inserted replaced

-:a8dcacf95bff
+:1126f0607c70
 OopMapSet* oop_maps) {
 code_buffer->finalize_oop_references(method);
 // create nmethod
 nmethod* nm = NULL;
 {
-MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
 int native_nmethod_size = CodeBlob::allocation_size(code_buffer, sizeof(nmethod));
 CodeOffsets offsets;
 offsets.set_value(CodeOffsets::Verified_Entry, vep_offset);
 offsets.set_value(CodeOffsets::Frame_Complete, frame_complete);
 nm = new (native_nmethod_size, CompLevel_none) nmethod(method(), compiler_none, native_nmethod_size,
 {
 assert(debug_info->oop_recorder() == code_buffer->oop_recorder(), "shared OR");
 code_buffer->finalize_oop_references(method);
 // create nmethod
 nmethod* nm = NULL;
-{ MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+{ MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
 int nmethod_size =
 CodeBlob::allocation_size(code_buffer, sizeof(nmethod))
 + adjust_pcs_size(debug_info->pcs_size())
 + align_up((int)dependencies->size_in_bytes(), oopSize)
 + align_up(handler_table->size_in_bytes()    , oopSize)
 clear_ic_callsites();
 }
 // Unregister must be done before the state change
 {
-MutexLockerEx ml(SafepointSynchronize::is_at_safepoint() ? NULL : CodeCache_lock,
+MutexLocker ml(SafepointSynchronize::is_at_safepoint() ? NULL : CodeCache_lock,
 Mutex::_no_safepoint_check_flag);
 Universe::heap()->unregister_nmethod(this);
 CodeCache::unregister_old_nmethod(this);
 }
 // this effectively makes the osr nmethod not entrant
 invalidate_osr_method();
 }
 // Enter critical section.  Does not block for safepoint.
-MutexLockerEx pl(Patching_lock, Mutex::_no_safepoint_check_flag);
+MutexLocker pl(Patching_lock, Mutex::_no_safepoint_check_flag);
 if (_state == state) {
 // another thread already performed this transition so nothing
 // to do, but return false to indicate this.
 return false;
 if (state == zombie) {
 {
 // Flushing dependencies must be done before any possible
 // safepoint can sneak in, otherwise the oops used by the
 // dependency logic could have become stale.
-MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
 if (nmethod_needs_unregister) {
 Universe::heap()->unregister_nmethod(this);
 CodeCache::unregister_old_nmethod(this);
 }
 flush_dependencies(/*delete_immediately*/true);
 NMethodSweeper::report_state_change(this);
 return true;
 }
 void nmethod::flush() {
-MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
 // Note that there are no valid oops in the nmethod anymore.
 assert(!is_osr_method() || is_unloaded() || is_zombie(),
 "osr nmethod must be unloaded or zombie before flushing");
 assert(is_zombie() || is_osr_method(), "must be a zombie method");
 assert (!is_locked_by_vm(), "locked methods shouldn't be flushed");
 get_and_cache_jmethod_id();
 }
 if (JvmtiExport::should_post_compiled_method_load()) {
 // Let the Service thread (which is a real Java thread) post the event
-MutexLockerEx ml(Service_lock, Mutex::_no_safepoint_check_flag);
+MutexLocker ml(Service_lock, Mutex::_no_safepoint_check_flag);
 JvmtiDeferredEventQueue::enqueue(
 JvmtiDeferredEvent::compiled_method_load_event(this));
 }
 }
 if (_jmethod_id != NULL && JvmtiExport::should_post_compiled_method_unload()) {
 assert(!unload_reported(), "already unloaded");
 JvmtiDeferredEvent event =
 JvmtiDeferredEvent::compiled_method_unload_event(this,
 _jmethod_id, insts_begin());
-MutexLockerEx ml(Service_lock, Mutex::_no_safepoint_check_flag);
+MutexLocker ml(Service_lock, Mutex::_no_safepoint_check_flag);
 JvmtiDeferredEventQueue::enqueue(event);
 }
 // The JVMTI CompiledMethodUnload event can be enabled or disabled at
 // any time. As the nmethod is being unloaded now we mark it has
 }
 nmethodLocker nml(nm);
 #ifdef ASSERT
 {
-MutexLockerEx pl(Patching_lock, Mutex::_no_safepoint_check_flag);
+MutexLocker pl(Patching_lock, Mutex::_no_safepoint_check_flag);
 // This relationship can only be checked safely under a lock
 assert(!nm->is_alive() || nm->is_unloading() || nm->jvmci_installed_code() == installedCode(), "sanity check");
 }
 #endif
 }
 // Multiple threads could reach this point so we now need to
 // lock and re-check the link to the nmethod so that only one
 // thread clears it.
-MutexLockerEx pl(Patching_lock, Mutex::_no_safepoint_check_flag);
+MutexLocker pl(Patching_lock, Mutex::_no_safepoint_check_flag);
 if (InstalledCode::address(installedCode) == nativeMethod) {
 InstalledCode::set_address(installedCode, 0);
 }
 }

changeset 54623	1126f0607c70
parent 54355	f226ab0b7f21
child 54669	ad45b3802d4e