changeset 20636:86c674274c94

Merge
author minqi
date Thu, 13 Nov 2014 20:00:53 +0000
parents ab72a2f48aef (diff) 643d6baecfe1 (current diff)
children 3a8a0fd171c5
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/macroAssembler_x86.cpp	Fri Nov 07 12:48:09 2014 -0800
+++ b/src/cpu/x86/vm/macroAssembler_x86.cpp	Thu Nov 13 20:00:53 2014 +0000
@@ -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