hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp

rev 6890 : 8062950: Bug in locking code when UseOptoBiasInlining is disabled: assert(dmw->is_neutral()) failed: invariant
Reviewed-by: dholmes, kvn

*** 1767,1777 ****
      // order to reduce the number of conditional branches in the most common cases.
      // Beware -- there's a subtle invariant that fetch of the markword
      // 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);
      }
  
  #if INCLUDE_RTM_OPT
      if (UseRTMForStackLocks && use_rtm) {
        rtm_stack_locking(objReg, tmpReg, scrReg, cx2Reg,
--- 1767,1777 ----
      // order to reduce the number of conditional branches in the most common cases.
      // Beware -- there's a subtle invariant that fetch of the markword
      // 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, false, DONE_LABEL, NULL, counters);
      }
  
  #if INCLUDE_RTM_OPT
      if (UseRTMForStackLocks && use_rtm) {
        rtm_stack_locking(objReg, tmpReg, scrReg, cx2Reg,