changeset 58331:e0f8e1818ca7 pattern-runtime

[pattern-runtime] manual merge with default
author chegar
date Tue, 15 Oct 2019 09:48:09 +0100
parents 77b970f34937 6941d77417f4
children 0b7596867dd8 e456af74284b
files
diffstat 3 files changed, 0 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/oops/klassVtable.cpp	Tue Oct 15 09:32:56 2019 +0100
+++ b/src/hotspot/share/oops/klassVtable.cpp	Tue Oct 15 09:48:09 2019 +0100
@@ -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)) {
--- a/src/hotspot/share/runtime/globals.hpp	Tue Oct 15 09:32:56 2019 +0100
+++ b/src/hotspot/share/runtime/globals.hpp	Tue Oct 15 09:48:09 2019 +0100
@@ -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")                                         \
                                                                             \
--- a/src/hotspot/share/runtime/mutexLocker.cpp	Tue Oct 15 09:32:56 2019 +0100
+++ b/src/hotspot/share/runtime/mutexLocker.cpp	Tue Oct 15 09:48:09 2019 +0100
@@ -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());