# HG changeset patch
# User mdoerr
# Date 1415201291 -3600
# Node ID ab72a2f48aef4cffbebae01ed450073d8dd95e8e
# Parent  d44a81242b1e653f4cf41b886b9a0929615132ab
8062950: Bug in locking code when UseOptoBiasInlining is disabled: assert(dmw->is_neutral()) failed: invariant
Reviewed-by: dholmes, kvn

diff -r d44a81242b1e -r ab72a2f48aef src/cpu/x86/vm/macroAssembler_x86.cpp
--- a/src/cpu/x86/vm/macroAssembler_x86.cpp	Wed Nov 12 10:34:08 2014 +0000
+++ b/src/cpu/x86/vm/macroAssembler_x86.cpp	Wed Nov 05 16:28:11 2014 +0100
@@ -1769,7 +1769,7 @@
     // at [FETCH], below, will never observe a biased encoding (*101b).
     // If this invariant is not held we risk exclusion (safety) failure.
     if (UseBiasedLocking && !UseOptoBiasInlining) {
-      biased_locking_enter(boxReg, objReg, tmpReg, scrReg, true, DONE_LABEL, NULL, counters);
+      biased_locking_enter(boxReg, objReg, tmpReg, scrReg, false, DONE_LABEL, NULL, counters);
     }
 
 #if INCLUDE_RTM_OPT