Automatic merge of jdk:master into master

duke · duke · commit 939f18fbf362 · 2020-10-12T06:02:25.000Z
diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
@@ -169,9 +169,6 @@ void assert_locked_or_safepoint(const Mutex* lock) {
   if (lock->owned_by_self()) return;
   if (SafepointSynchronize::is_at_safepoint()) return;
   if (!Universe::is_fully_initialized()) return;
-  // see if invoker of VM operation owns it
-  VM_Operation* op = VMThread::vm_operation();
-  if (op != NULL && op->calling_thread() == lock->owner()) return;
   fatal("must own lock %s", lock->name());
 }
 

Original file line number	Diff line number	Diff line change
`@@ -169,9 +169,6 @@ void assert_locked_or_safepoint(const Mutex* lock) {`
`169`	`169`	`if (lock->owned_by_self()) return;`
`170`	`170`	`if (SafepointSynchronize::is_at_safepoint()) return;`
`171`	`171`	`if (!Universe::is_fully_initialized()) return;`
`172`		`- // see if invoker of VM operation owns it`
`173`		`- VM_Operation* op = VMThread::vm_operation();`
`174`		`- if (op != NULL && op->calling_thread() == lock->owner()) return;`
`175`	`172`	`fatal("must own lock %s", lock->name());`
`176`	`173`	`}`
`177`	`174`