src/hotspot/cpu/riscv/riscv.ad

*** 1144,12 ***
      // We handle these
      case Op_CompareAndSwapI:
      case Op_CompareAndSwapL:
      case Op_CompareAndSwapP:
      case Op_CompareAndSwapN:
-     case Op_ShenandoahCompareAndSwapP:
-     case Op_ShenandoahCompareAndSwapN:
      case Op_CompareAndSwapB:
      case Op_CompareAndSwapS:
      case Op_GetAndSetI:
      case Op_GetAndSetL:
      case Op_GetAndSetP:
--- 1144,10 ---

*** 1167,14 ***
      case Op_WeakCompareAndSwapS:
      case Op_WeakCompareAndSwapI:
      case Op_WeakCompareAndSwapL:
      case Op_WeakCompareAndSwapP:
      case Op_WeakCompareAndSwapN:
-     case Op_ShenandoahWeakCompareAndSwapP:
-     case Op_ShenandoahWeakCompareAndSwapN:
-     case Op_ShenandoahCompareAndExchangeP:
-     case Op_ShenandoahCompareAndExchangeN:
        return maybe_volatile;
      default:
        return false;
    }
  }
--- 1165,10 ---