get_or_create_id code reuse

Author: beepster4096

src/shims/windows/sync.rs

@@ -7,6 +7,33 @@ use std::time::{Duration, Instant};
 impl<'mir, 'tcx: 'mir> EvalContextExtPriv<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
 
 trait EvalContextExtPriv<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx> {
+    fn get_or_create_id(
+        &mut self,
+        next_id: Scalar<Tag>,
+        value_place: &MPlaceTy<'tcx, Tag>,
+    ) -> InterpResult<'tcx, Option<u32>> {
+        let this = self.eval_context_mut();
+
+        let (old, success) = this
+            .atomic_compare_exchange_scalar(
+                value_place,
+                &ImmTy::from_uint(0u32, this.machine.layouts.u32),
+                next_id.into(),
+                AtomicRwOp::Relaxed,
+                AtomicReadOp::Relaxed,
+                false,
+            )?
+            .to_scalar_pair()
+            .expect("compare_exchange returns a scalar pair");
+
+        Ok(if success.to_bool().expect("compare_exchange's second return value is a bool") {
+            // Caller of the closure needs to allocate next_id
+            None
+        } else {
+            Some(old.to_u32().expect("layout is u32"))
+        })
+    }
+
     // Locks are pointer-sized pieces of data, initialized to 0.
     // We use the first 4 bytes to store the RwLockId.
     fn srwlock_get_or_create_id(
@@ -17,24 +44,7 @@ trait EvalContextExtPriv<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         let value_place = this.deref_operand_and_offset(lock_op, 0, this.machine.layouts.u32)?;
 
         this.rwlock_get_or_create(|ecx, next_id| {
-            let (old, success) = ecx
-                .atomic_compare_exchange_scalar(
-                    &value_place,
-                    &ImmTy::from_uint(0u32, ecx.machine.layouts.u32),
-                    next_id.to_u32_scalar().into(),
-                    AtomicRwOp::Relaxed,
-                    AtomicReadOp::Relaxed,
-                    false,
-                )?
-                .to_scalar_pair()
-                .expect("compare_exchange returns a scalar pair");
-
-            Ok(if success.to_bool().expect("compare_exchange's second return value is a bool") {
-                // Caller of the closure needs to allocate next_id
-                None
-            } else {
-                Some(RwLockId::from_u32(old.to_u32().expect("layout is u32")))
-            })
+            Ok(ecx.get_or_create_id(next_id.to_u32_scalar(), &value_place)?.map(RwLockId::from_u32))
         })
     }
 
@@ -47,24 +57,9 @@ trait EvalContextExtPriv<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         let value_place = this.deref_operand_and_offset(condvar_op, 0, this.machine.layouts.u32)?;
 
         this.condvar_get_or_create(|ecx, next_id| {
-            let (old, success) = ecx
-                .atomic_compare_exchange_scalar(
-                    &value_place,
-                    &ImmTy::from_uint(0u32, ecx.machine.layouts.u32),
-                    next_id.to_u32_scalar().into(),
-                    AtomicRwOp::Relaxed,
-                    AtomicReadOp::Relaxed,
-                    false,
-                )?
-                .to_scalar_pair()
-                .expect("compare_exchange returns a scalar pair");
-
-            Ok(if success.to_bool().expect("compare_exchange's second return value is a bool") {
-                // Caller of the closure needs to allocate next_id
-                None
-            } else {
-                Some(CondvarId::from_u32(old.to_u32().expect("layout is u32")))
-            })
+            Ok(ecx
+                .get_or_create_id(next_id.to_u32_scalar(), &value_place)?
+                .map(CondvarId::from_u32))
         })
     }