src/hotspot/share/c1/c1_LIRGenerator.cpp

*** 3066,3082 ****
    case vmIntrinsics::_compareAndSetLong:
      do_CompareAndSwap(x, longType);
      break;
  
    case vmIntrinsics::_loadFence :
!     if (os::is_MP()) __ membar_acquire();
      break;
    case vmIntrinsics::_storeFence:
!     if (os::is_MP()) __ membar_release();
      break;
    case vmIntrinsics::_fullFence :
!     if (os::is_MP()) __ membar();
      break;
    case vmIntrinsics::_onSpinWait:
      __ on_spin_wait();
      break;
    case vmIntrinsics::_Reference_get:
--- 3066,3082 ----
    case vmIntrinsics::_compareAndSetLong:
      do_CompareAndSwap(x, longType);
      break;
  
    case vmIntrinsics::_loadFence :
!     __ membar_acquire();
      break;
    case vmIntrinsics::_storeFence:
!     __ membar_release();
      break;
    case vmIntrinsics::_fullFence :
!     __ membar();
      break;
    case vmIntrinsics::_onSpinWait:
      __ on_spin_wait();
      break;
    case vmIntrinsics::_Reference_get:
*** 3621,3631 ****
    }
    return result;
  }
  
  void LIRGenerator::do_MemBar(MemBar* x) {
-   if (os::is_MP()) {
      LIR_Code code = x->code();
      switch(code) {
        case lir_membar_acquire   : __ membar_acquire(); break;
        case lir_membar_release   : __ membar_release(); break;
        case lir_membar           : __ membar(); break;
--- 3621,3630 ----
*** 3633,3643 ****
        case lir_membar_storestore: __ membar_storestore(); break;
        case lir_membar_loadstore : __ membar_loadstore(); break;
        case lir_membar_storeload : __ membar_storeload(); break;
        default                   : ShouldNotReachHere(); break;
      }
-   }
  }
  
  LIR_Opr LIRGenerator::mask_boolean(LIR_Opr array, LIR_Opr value, CodeEmitInfo*& null_check_info) {
    LIR_Opr value_fixed = rlock_byte(T_BYTE);
    if (TwoOperandLIRForm) {
--- 3632,3641 ----