about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-09-06 13:18:25 +0000
committerbors <bors@rust-lang.org>2024-09-06 13:18:25 +0000
commit59cb24dc76eb999390541241cfc45217fe2f6326 (patch)
tree188d2c0bfc2209dd6add79dea1a8e66e843f8f8b
parent72aa65beb3e689afcb7edfc28731ff2bc3a62dc5 (diff)
parent4dfafb1a8d34c6ee14af811b619801da782eb718 (diff)
Auto merge of #3865 - Mandragorian:doc_fixes_pthreads, r=RalfJung
Fix comment in mutex_id_offset

We no longer store the kind inside the pthread_mutex_t, so this comment is outdated.
Sorry I didn't catch this in the original PR.
-rw-r--r--src/tools/miri/src/shims/unix/sync.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/tools/miri/src/shims/unix/sync.rs b/src/tools/miri/src/shims/unix/sync.rs
index 5da5cab8fe4..57cc9cf4618 100644
--- a/src/tools/miri/src/shims/unix/sync.rs
+++ b/src/tools/miri/src/shims/unix/sync.rs
@@ -62,7 +62,6 @@ fn is_mutex_kind_normal<'tcx>(ecx: &MiriInterpCx<'tcx>, kind: i32) -> InterpResu
 // pthread_mutex_t is between 24 and 48 bytes, depending on the platform.
 // We ignore the platform layout and store our own fields:
 // - id: u32
-// - kind: i32
 
 fn mutex_id_offset<'tcx>(ecx: &MiriInterpCx<'tcx>) -> InterpResult<'tcx, u64> {
     let offset = match &*ecx.tcx.sess.target.os {