Skip to content

Commit 3a01493

Browse files
Vanille-NVanille-N
committed
SbTag -> BorTag everywhere
1 parent 2528f4e commit 3a01493

File tree

18 files changed

+62
-62
lines changed

18 files changed

+62
-62
lines changed

‎src/tools/miri/src/bin/miri.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ fn main() {
413413
err
414414
),
415415
};
416-
for id in ids.into_iter().map(miri::SbTag::new) {
416+
for id in ids.into_iter().map(miri::BorTag::new) {
417417
if let Some(id) = id {
418418
miri_config.tracked_pointer_tags.insert(id);
419419
} else {

‎src/tools/miri/src/concurrency/data_race.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ pub struct VClockAlloc {
670670
}
671671

672672
impl VisitTags for VClockAlloc {
673-
fn visit_tags(&self, _visit: &mut dyn FnMut(SbTag)) {
673+
fn visit_tags(&self, _visit: &mut dyn FnMut(BorTag)) {
674674
// No tags here.
675675
}
676676
}
@@ -1220,7 +1220,7 @@ pub struct GlobalState {
12201220
}
12211221

12221222
impl VisitTags for GlobalState {
1223-
fn visit_tags(&self, _visit: &mut dyn FnMut(SbTag)) {
1223+
fn visit_tags(&self, _visit: &mut dyn FnMut(BorTag)) {
12241224
// We don't have any tags.
12251225
}
12261226
}

‎src/tools/miri/src/concurrency/init_once.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub(super) struct InitOnce<'mir, 'tcx> {
4545
}
4646

4747
impl<'mir, 'tcx> VisitTags for InitOnce<'mir, 'tcx> {
48-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
48+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
4949
for waiter in self.waiters.iter() {
5050
waiter.callback.visit_tags(visit);
5151
}

‎src/tools/miri/src/concurrency/sync.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ pub(crate) struct SynchronizationState<'mir, 'tcx> {
181181
}
182182

183183
impl<'mir, 'tcx> VisitTags for SynchronizationState<'mir, 'tcx> {
184-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
184+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
185185
for init_once in self.init_onces.iter() {
186186
init_once.visit_tags(visit);
187187
}

‎src/tools/miri/src/concurrency/thread.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ impl<'mir, 'tcx> Thread<'mir, 'tcx> {
212212
}
213213

214214
impl VisitTags for Thread<'_, '_> {
215-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
215+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
216216
let Thread {
217217
panic_payload,
218218
last_error,
@@ -233,7 +233,7 @@ impl VisitTags for Thread<'_, '_> {
233233
}
234234

235235
impl VisitTags for Frame<'_, '_, Provenance, FrameData<'_>> {
236-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
236+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
237237
let Frame {
238238
return_place,
239239
locals,
@@ -316,7 +316,7 @@ pub struct ThreadManager<'mir, 'tcx> {
316316
}
317317

318318
impl VisitTags for ThreadManager<'_, '_> {
319-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
319+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
320320
let ThreadManager {
321321
threads,
322322
thread_local_alloc_ids,

‎src/tools/miri/src/concurrency/weak_memory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ pub struct StoreBufferAlloc {
109109
}
110110

111111
impl VisitTags for StoreBufferAlloc {
112-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
112+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
113113
let Self { store_buffers } = self;
114114
for val in store_buffers
115115
.borrow()

‎src/tools/miri/src/eval.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ pub struct MiriConfig {
103103
/// The seed to use when non-determinism or randomness are required (e.g. ptr-to-int cast, `getrandom()`).
104104
pub seed: Option<u64>,
105105
/// The stacked borrows pointer ids to report about
106-
pub tracked_pointer_tags: FxHashSet<SbTag>,
106+
pub tracked_pointer_tags: FxHashSet<BorTag>,
107107
/// The stacked borrows call IDs to report about
108108
pub tracked_call_ids: FxHashSet<CallId>,
109109
/// The allocation ids to report about.
@@ -138,7 +138,7 @@ pub struct MiriConfig {
138138
/// The location of a shared object file to load when calling external functions
139139
/// FIXME! consider allowing users to specify paths to multiple SO files, or to a directory
140140
pub external_so_file: Option<PathBuf>,
141-
/// Run a garbage collector for SbTags every N basic blocks.
141+
/// Run a garbage collector for BorTags every N basic blocks.
142142
pub gc_interval: u32,
143143
/// The number of CPUs to be reported by miri.
144144
pub num_cpus: u32,

‎src/tools/miri/src/intptrcast.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub struct GlobalStateInner {
4545
}
4646

4747
impl VisitTags for GlobalStateInner {
48-
fn visit_tags(&self, _visit: &mut dyn FnMut(SbTag)) {
48+
fn visit_tags(&self, _visit: &mut dyn FnMut(BorTag)) {
4949
// Nothing to visit here.
5050
}
5151
}
@@ -105,7 +105,7 @@ impl<'mir, 'tcx> GlobalStateInner {
105105
pub fn expose_ptr(
106106
ecx: &mut MiriInterpCx<'mir, 'tcx>,
107107
alloc_id: AllocId,
108-
sb: SbTag,
108+
tag: BorTag,
109109
) -> InterpResult<'tcx> {
110110
let global_state = ecx.machine.intptrcast.get_mut();
111111
// In strict mode, we don't need this, so we can save some cycles by not tracking it.

‎src/tools/miri/src/machine.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ pub enum Provenance {
147147
Concrete {
148148
alloc_id: AllocId,
149149
/// Stacked Borrows tag.
150-
sb: SbTag,
150+
tag: BorTag,
151151
},
152152
Wildcard,
153153
}
@@ -173,7 +173,7 @@ impl std::hash::Hash for Provenance {
173173
/// The "extra" information a pointer has over a regular AllocId.
174174
#[derive(Copy, Clone, PartialEq)]
175175
pub enum ProvenanceExtra {
176-
Concrete(SbTag),
176+
Concrete(BorTag),
177177
Wildcard,
178178
}
179179

@@ -188,15 +188,15 @@ static_assert_size!(Scalar<Provenance>, 32);
188188
impl fmt::Debug for Provenance {
189189
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
190190
match self {
191-
Provenance::Concrete { alloc_id, sb } => {
191+
Provenance::Concrete { alloc_id, tag } => {
192192
// Forward `alternate` flag to `alloc_id` printing.
193193
if f.alternate() {
194194
write!(f, "[{alloc_id:#?}]")?;
195195
} else {
196196
write!(f, "[{alloc_id:?}]")?;
197197
}
198198
// Print Stacked Borrows tag.
199-
write!(f, "{sb:?}")?;
199+
write!(f, "{tag:?}")?;
200200
}
201201
Provenance::Wildcard => {
202202
write!(f, "[wildcard]")?;
@@ -221,9 +221,9 @@ impl interpret::Provenance for Provenance {
221221
match (left, right) {
222222
// If both are the *same* concrete tag, that is the result.
223223
(
224-
Some(Provenance::Concrete { alloc_id: left_alloc, sb: left_sb }),
225-
Some(Provenance::Concrete { alloc_id: right_alloc, sb: right_sb }),
226-
) if left_alloc == right_alloc && left_sb == right_sb => left,
224+
Some(Provenance::Concrete { alloc_id: left_alloc, tag: left_tag }),
225+
Some(Provenance::Concrete { alloc_id: right_alloc, tag: right_tag }),
226+
) if left_alloc == right_alloc && left_tag == right_tag => left,
227227
// If one side is a wildcard, the best possible outcome is that it is equal to the other
228228
// one, and we use that.
229229
(Some(Provenance::Wildcard), o) | (o, Some(Provenance::Wildcard)) => o,
@@ -243,7 +243,7 @@ impl fmt::Debug for ProvenanceExtra {
243243
}
244244

245245
impl ProvenanceExtra {
246-
pub fn and_then<T>(self, f: impl FnOnce(SbTag) -> Option<T>) -> Option<T> {
246+
pub fn and_then<T>(self, f: impl FnOnce(BorTag) -> Option<T>) -> Option<T> {
247247
match self {
248248
ProvenanceExtra::Concrete(pid) => f(pid),
249249
ProvenanceExtra::Wildcard => None,
@@ -463,9 +463,9 @@ pub struct MiriMachine<'mir, 'tcx> {
463463
#[cfg(not(target_os = "linux"))]
464464
pub external_so_lib: Option<!>,
465465

466-
/// Run a garbage collector for SbTags every N basic blocks.
466+
/// Run a garbage collector for BorTags every N basic blocks.
467467
pub(crate) gc_interval: u32,
468-
/// The number of blocks that passed since the last SbTag GC pass.
468+
/// The number of blocks that passed since the last BorTag GC pass.
469469
pub(crate) since_gc: u32,
470470
/// The number of CPUs to be reported by miri.
471471
pub(crate) num_cpus: u32,
@@ -656,7 +656,7 @@ impl<'mir, 'tcx> MiriMachine<'mir, 'tcx> {
656656
}
657657

658658
impl VisitTags for MiriMachine<'_, '_> {
659-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
659+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
660660
#[rustfmt::skip]
661661
let MiriMachine {
662662
threads,
@@ -959,10 +959,10 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
959959
stacked_borrows.borrow_mut().base_ptr_tag(ptr.provenance, &ecx.machine)
960960
} else {
961961
// Value does not matter, SB is disabled
962-
SbTag::default()
962+
BorTag::default()
963963
};
964964
Pointer::new(
965-
Provenance::Concrete { alloc_id: ptr.provenance, sb: sb_tag },
965+
Provenance::Concrete { alloc_id: ptr.provenance, tag },
966966
Size::from_bytes(absolute_addr),
967967
)
968968
}
@@ -980,8 +980,8 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
980980
ptr: Pointer<Self::Provenance>,
981981
) -> InterpResult<'tcx> {
982982
match ptr.provenance {
983-
Provenance::Concrete { alloc_id, sb } =>
984-
intptrcast::GlobalStateInner::expose_ptr(ecx, alloc_id, sb),
983+
Provenance::Concrete { alloc_id, tag } =>
984+
intptrcast::GlobalStateInner::expose_ptr(ecx, alloc_id, tag),
985985
Provenance::Wildcard => {
986986
// No need to do anything for wildcard pointers as
987987
// their provenances have already been previously exposed.
@@ -999,11 +999,11 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
999999
let rel = intptrcast::GlobalStateInner::abs_ptr_to_rel(ecx, ptr);
10001000

10011001
rel.map(|(alloc_id, size)| {
1002-
let sb = match ptr.provenance {
1003-
Provenance::Concrete { sb, .. } => ProvenanceExtra::Concrete(sb),
1002+
let tag = match ptr.provenance {
1003+
Provenance::Concrete { tag, .. } => ProvenanceExtra::Concrete(tag),
10041004
Provenance::Wildcard => ProvenanceExtra::Wildcard,
10051005
};
1006-
(alloc_id, size, sb)
1006+
(alloc_id, size, tag)
10071007
})
10081008
}
10091009

‎src/tools/miri/src/shims/env.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub struct EnvVars<'tcx> {
3737
}
3838

3939
impl VisitTags for EnvVars<'_> {
40-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
40+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
4141
let EnvVars { map, environ } = self;
4242

4343
environ.visit_tags(visit);

‎src/tools/miri/src/shims/panic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub struct CatchUnwindData<'tcx> {
3636
}
3737

3838
impl VisitTags for CatchUnwindData<'_> {
39-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
39+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
4040
let CatchUnwindData { catch_fn, data, dest, ret: _ } = self;
4141
catch_fn.visit_tags(visit);
4242
data.visit_tags(visit);

‎src/tools/miri/src/shims/time.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ struct UnblockCallback {
278278
}
279279

280280
impl VisitTags for UnblockCallback {
281-
fn visit_tags(&self, _visit: &mut dyn FnMut(SbTag)) {}
281+
fn visit_tags(&self, _visit: &mut dyn FnMut(BorTag)) {}
282282
}
283283

284284
impl<'mir, 'tcx: 'mir> MachineCallback<'mir, 'tcx> for UnblockCallback {

‎src/tools/miri/src/shims/tls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ impl<'tcx> TlsData<'tcx> {
208208
}
209209

210210
impl VisitTags for TlsData<'_> {
211-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
211+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
212212
let TlsData { keys, macos_thread_dtors, next_key: _ } = self;
213213

214214
for scalar in keys.values().flat_map(|v| v.data.values()) {

‎src/tools/miri/src/shims/unix/fs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ pub struct FileHandler {
278278
}
279279

280280
impl VisitTags for FileHandler {
281-
fn visit_tags(&self, _visit: &mut dyn FnMut(SbTag)) {
281+
fn visit_tags(&self, _visit: &mut dyn FnMut(BorTag)) {
282282
// All our FileDescriptor do not have any tags.
283283
}
284284
}
@@ -490,7 +490,7 @@ impl Default for DirHandler {
490490
}
491491

492492
impl VisitTags for DirHandler {
493-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
493+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
494494
let DirHandler { streams, next_id: _ } = self;
495495

496496
for dir in streams.values() {

‎src/tools/miri/src/shims/unix/linux/sync.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ pub fn futex<'tcx>(
183183
}
184184

185185
impl<'tcx> VisitTags for Callback<'tcx> {
186-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
186+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
187187
let Callback { thread: _, addr_usize: _, dest } = self;
188188
dest.visit_tags(visit);
189189
}

‎src/tools/miri/src/shims/unix/sync.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
747747
}
748748

749749
impl<'tcx> VisitTags for Callback<'tcx> {
750-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
750+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
751751
let Callback { active_thread: _, mutex_id: _, id: _, dest } = self;
752752
dest.visit_tags(visit);
753753
}

‎src/tools/miri/src/shims/windows/sync.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
182182
}
183183

184184
impl<'tcx> VisitTags for Callback<'tcx> {
185-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
185+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
186186
let Callback { init_once_id: _, pending_place } = self;
187187
pending_place.visit_tags(visit);
188188
}
@@ -315,7 +315,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
315315
}
316316

317317
impl<'tcx> VisitTags for Callback<'tcx> {
318-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
318+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
319319
let Callback { thread: _, addr: _, dest } = self;
320320
dest.visit_tags(visit);
321321
}
@@ -419,7 +419,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
419419
}
420420

421421
impl<'tcx> VisitTags for Callback<'tcx> {
422-
fn visit_tags(&self, visit: &mut dyn FnMut(SbTag)) {
422+
fn visit_tags(&self, visit: &mut dyn FnMut(BorTag)) {
423423
let Callback { thread: _, condvar_id: _, lock_id: _, mode: _, dest } = self;
424424
dest.visit_tags(visit);
425425
}

0 commit comments

Comments
 (0)