fix ci

Author: henryboisdequin

src/data_race.rs

@@ -546,27 +546,26 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: MiriEvalContextExt<'mir, 'tcx> {
     /// scalar value, the old value is returned.
     fn atomic_min_max_scalar(
         &mut self,
-        place: MPlaceTy<'tcx, Tag>,
+        place: &MPlaceTy<'tcx, Tag>,
         rhs: ImmTy<'tcx, Tag>,
         min: bool,
         atomic: AtomicRwOp,
     ) -> InterpResult<'tcx, ImmTy<'tcx, Tag>> {
         let this = self.eval_context_mut();
 
-        let old = this.allow_data_races_mut(|this| this.read_immediate(place.into()))?;
+        let old = this.allow_data_races_mut(|this| this.read_immediate(&place.into()))?;
+        let lt = this.overflowing_binary_op(mir::BinOp::Lt, &old, &rhs)?.0.to_bool()?;
 
-        // `binary_op` will bail if either of them is not a scalar.
-        let cond = if min {
-            this.overflowing_binary_op(mir::BinOp::Lt, &old, &rhs)?.0
+        let new_val = if min {
+            if lt { &old } else { &rhs }
         } else {
-            this.overflowing_binary_op(mir::BinOp::Gt, &old, &rhs)?.0
+            if lt { &rhs } else { &old }
         };
 
-        if cond.to_bool()? {
-            this.allow_data_races_mut(|this| this.write_immediate(*rhs, place.into()))?;
-        }
+        this.allow_data_races_mut(|this| this.write_immediate_to_mplace(**new_val, place))?;
 
         this.validate_atomic_rmw(&place, atomic)?;
+
         // Return the old value.
         Ok(old)
     }

src/shims/intrinsics.rs

@@ -10,7 +10,7 @@ use rustc_target::abi::{Align, Integer, LayoutOf};
 use crate::*;
 use helpers::check_arg_count;
 
-enum AtomicOp {
+pub enum AtomicOp {
     MirOp(mir::BinOp, bool),
     Max,
     Min,
@@ -605,15 +605,15 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             "atomic_umin_relaxed" =>
                 this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::Relaxed)?,
             "atomic_umax" =>
-                this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::SeqCst)?,
+                this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::SeqCst)?,
             "atomic_umax_acq" =>
-                this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::Acquire)?,
+                this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::Acquire)?,
             "atomic_umax_rel" =>
-                this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::Release)?,
+                this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::Release)?,
             "atomic_umax_acqrel" =>
-                this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::AcqRel)?,
+                this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::AcqRel)?,
             "atomic_umax_relaxed" =>
-                this.atomic_op_min_max(args, dest, AtomicOp::Min, AtomicRwOp::Relaxed)?,
+                this.atomic_op_min_max(args, dest, AtomicOp::Max, AtomicRwOp::Relaxed)?,
 
             // Query type information
             "assert_zero_valid" | "assert_uninit_valid" => {
@@ -754,12 +754,12 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
 
         match atomic_op {
             AtomicOp::Min => {
-                let old = this.atomic_min_max_scalar(place, rhs, true, atomic)?;
+                let old = this.atomic_min_max_scalar(&place, rhs, true, atomic)?;
                 this.write_immediate(*old, &dest)?; // old value is returned
                 Ok(())
             }
             AtomicOp::Max => {
-                let old = this.atomic_min_max_scalar(place, rhs, false, atomic)?;
+                let old = this.atomic_min_max_scalar(&place, rhs, false, atomic)?;
                 this.write_immediate(*old, &dest)?; // old value is returned
                 Ok(())
             }