# HG changeset patch
# User kbarrett
# Date 1570854173 14400
# Node ID 6941d77417f4664069e5bb5cbc7237efd56e89ba
# Parent  dcc76095424324c28947e6c6d9276e21ecd77f52
8232147: Remove notproduct option IgnoreLockingAssertions
Summary: Removed option.
Reviewed-by: coleenp, dholmes

diff -r dcc760954243 -r 6941d77417f4 src/hotspot/share/oops/klassVtable.cpp
--- a/src/hotspot/share/oops/klassVtable.cpp	Fri Oct 11 14:49:05 2019 -0700
+++ b/src/hotspot/share/oops/klassVtable.cpp	Sat Oct 12 00:22:53 2019 -0400
@@ -1501,7 +1501,6 @@
 #endif
 
 void vtableEntry::verify(klassVtable* vt, outputStream* st) {
-  NOT_PRODUCT(FlagSetting fs(IgnoreLockingAssertions, true));
   Klass* vtklass = vt->klass();
   if (vtklass->is_instance_klass() &&
      (InstanceKlass::cast(vtklass)->major_version() >= klassVtable::VTABLE_TRANSITIVE_OVERRIDE_VERSION)) {
diff -r dcc760954243 -r 6941d77417f4 src/hotspot/share/runtime/globals.hpp
--- a/src/hotspot/share/runtime/globals.hpp	Fri Oct 11 14:49:05 2019 -0700
+++ b/src/hotspot/share/runtime/globals.hpp	Sat Oct 12 00:22:53 2019 -0400
@@ -1197,9 +1197,6 @@
   develop(bool, TraceCreateZombies, false,                                  \
           "trace creation of zombie nmethods")                              \
                                                                             \
-  notproduct(bool, IgnoreLockingAssertions, false,                          \
-          "disable locking assertions (for speed)")                         \
-                                                                            \
   product(bool, RangeCheckElimination, true,                                \
           "Eliminate range checks")                                         \
                                                                             \
diff -r dcc760954243 -r 6941d77417f4 src/hotspot/share/runtime/mutexLocker.cpp
--- a/src/hotspot/share/runtime/mutexLocker.cpp	Fri Oct 11 14:49:05 2019 -0700
+++ b/src/hotspot/share/runtime/mutexLocker.cpp	Sat Oct 12 00:22:53 2019 -0400
@@ -161,7 +161,6 @@
 #ifdef ASSERT
 void assert_locked_or_safepoint(const Mutex* lock) {
   // check if this thread owns the lock (common case)
-  if (IgnoreLockingAssertions) return;
   assert(lock != NULL, "Need non-NULL lock");
   if (lock->owned_by_self()) return;
   if (SafepointSynchronize::is_at_safepoint()) return;
@@ -174,7 +173,6 @@
 
 // a weaker assertion than the above
 void assert_locked_or_safepoint_weak(const Mutex* lock) {
-  if (IgnoreLockingAssertions) return;
   assert(lock != NULL, "Need non-NULL lock");
   if (lock->is_locked()) return;
   if (SafepointSynchronize::is_at_safepoint()) return;
@@ -184,7 +182,6 @@
 
 // a stronger assertion than the above
 void assert_lock_strong(const Mutex* lock) {
-  if (IgnoreLockingAssertions) return;
   assert(lock != NULL, "Need non-NULL lock");
   if (lock->owned_by_self()) return;
   fatal("must own lock %s", lock->name());