changeset 23982:49423b7aaea5

No need for ObjectMonitor::_succ, allow EmitSync=2|8 in combination with inline bias-locking
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Mon, 05 Dec 2016 16:30:33 +0100
parents f272ef93c3a3
children 78bb8eb7ab76
files src/share/vm/jvmci/vmStructs_jvmci.hpp src/share/vm/runtime/arguments.cpp
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/jvmci/vmStructs_jvmci.hpp	Mon Dec 05 11:44:02 2016 +0100
+++ b/src/share/vm/jvmci/vmStructs_jvmci.hpp	Mon Dec 05 16:30:33 2016 +0100
@@ -89,7 +89,6 @@
                                                                                                                                      \
   volatile_nonstatic_field(ObjectMonitor,      _cxq,                                   ObjectWaiter*)                                \
   volatile_nonstatic_field(ObjectMonitor,      _EntryList,                             ObjectWaiter*)                                \
-  volatile_nonstatic_field(ObjectMonitor,      _succ,                                  Thread*)                                      \
                                                                                                                                      \
   nonstatic_field(JavaThread,                  _pending_deoptimization,                int)                                          \
   nonstatic_field(JavaThread,                  _pending_failed_speculation,            oop)                                          \
--- a/src/share/vm/runtime/arguments.cpp	Mon Dec 05 11:44:02 2016 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Mon Dec 05 16:30:33 2016 +0100
@@ -4195,7 +4195,7 @@
     }
   }
 #ifdef COMPILER2
-  if (!UseBiasedLocking || EmitSync != 0) {
+  if (!UseBiasedLocking || (EmitSync & ~(2 | 8)) != 0) {
     UseOptoBiasInlining = false;
   }
 #endif