Skip to content

Commit 395f5d4

Browse files
committed
Rename shims::{sync -> posic_sync} and move sync_singlethread test to other sync test
1 parent 76d99cf commit 395f5d4

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

src/lib.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ pub use rustc_mir::interpret::*;
3939
// Resolve ambiguity.
4040
pub use rustc_mir::interpret::{self, AllocMap, PlaceTy};
4141

42-
pub use crate::shims::dlsym::{Dlsym, EvalContextExt as DlsymEvalContextExt};
43-
pub use crate::shims::env::{EnvVars, EvalContextExt as EnvEvalContextExt};
44-
pub use crate::shims::foreign_items::EvalContextExt as ForeignItemsEvalContextExt;
45-
pub use crate::shims::fs::{DirHandler, EvalContextExt as FileEvalContextExt, FileHandler};
46-
pub use crate::shims::intrinsics::EvalContextExt as IntrinsicsEvalContextExt;
47-
pub use crate::shims::os_str::EvalContextExt as OsStrEvalContextExt;
48-
pub use crate::shims::panic::{CatchUnwindData, EvalContextExt as PanicEvalContextExt};
49-
pub use crate::shims::sync::{EvalContextExt as SyncShimsEvalContextExt};
50-
pub use crate::shims::thread::EvalContextExt as ThreadShimsEvalContextExt;
51-
pub use crate::shims::time::EvalContextExt as TimeEvalContextExt;
52-
pub use crate::shims::tls::{EvalContextExt as TlsEvalContextExt, TlsData};
53-
pub use crate::shims::EvalContextExt as ShimsEvalContextExt;
42+
pub use crate::shims::dlsym::{Dlsym, EvalContextExt as _};
43+
pub use crate::shims::env::{EnvVars, EvalContextExt as _};
44+
pub use crate::shims::foreign_items::EvalContextExt as _;
45+
pub use crate::shims::fs::{DirHandler, EvalContextExt as _, FileHandler};
46+
pub use crate::shims::intrinsics::EvalContextExt as _;
47+
pub use crate::shims::os_str::EvalContextExt as _;
48+
pub use crate::shims::panic::{CatchUnwindData, EvalContextExt as _};
49+
pub use crate::shims::posix_sync::{EvalContextExt as _};
50+
pub use crate::shims::thread::EvalContextExt as _;
51+
pub use crate::shims::time::EvalContextExt as _;
52+
pub use crate::shims::tls::{EvalContextExt as _, TlsData};
53+
pub use crate::shims::EvalContextExt as _;
5454

5555
pub use crate::diagnostics::{
5656
register_diagnostic, report_error, EvalContextExt as DiagnosticsEvalContextExt,

src/shims/sync.rs renamed to src/shims/posix_sync.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
522522

523523
mutex_set_kind(this, mutex_op, ScalarMaybeUninit::Uninit)?;
524524
mutex_set_id(this, mutex_op, ScalarMaybeUninit::Uninit)?;
525+
// FIXME: delete interpreter state associated with this mutex.
525526

526527
Ok(0)
527528
}
@@ -640,6 +641,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
640641
}
641642

642643
rwlock_set_id(this, rwlock_op, ScalarMaybeUninit::Uninit)?;
644+
// FIXME: delete interpreter state associated with this rwlock.
643645

644646
Ok(0)
645647
}
@@ -833,6 +835,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
833835
}
834836
cond_set_id(this, cond_op, ScalarMaybeUninit::Uninit)?;
835837
cond_set_clock_id(this, cond_op, ScalarMaybeUninit::Uninit)?;
838+
// FIXME: delete interpreter state associated with this condvar.
836839

837840
Ok(0)
838841
}

src/thread.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ pub enum ThreadState {
9191
/// responsibility of the synchronization primitives to track threads that
9292
/// are blocked by them.
9393
BlockedOnSync,
94-
/// The thread has terminated its execution (we do not delete terminated
95-
/// threads).
94+
/// The thread has terminated its execution. We do not delete terminated
95+
/// threads (FIXME: why?).
9696
Terminated,
9797
}
9898

0 commit comments

Comments
 (0)