8079359: disable JDK-8061553 optimization while JDK-8077392 is resolved

Borrow an unused SyncFlags value to disable the "fast enter" optimization.

Reviewed-by: lana, dsamersoff, amurillo
This commit is contained in:
Daniel D. Daugherty 2015-05-05 18:57:57 -07:00
parent 40dd1bad2c
commit a692523e95

@ -1793,7 +1793,9 @@ JRT_END
// Handles the uncommon case in locking, i.e., contention or an inflated lock.
JRT_BLOCK_ENTRY(void, SharedRuntime::complete_monitor_locking_C(oopDesc* _obj, BasicLock* lock, JavaThread* thread))
if (!SafepointSynchronize::is_synchronizing()) {
// Disable ObjectSynchronizer::quick_enter() in default config
// until JDK-8077392 is resolved.
if ((SyncFlags & 256) != 0 && !SafepointSynchronize::is_synchronizing()) {
// Only try quick_enter() if we're not trying to reach a safepoint
// so that the calling thread reaches the safepoint more quickly.
if (ObjectSynchronizer::quick_enter(_obj, thread, lock)) return;