user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only add 'inside this call' for Invalidation diagnostics

Browse source
This commit is contained in:
Ben Kimock 2022-09-22 10:44:03 -04:00
parent 45d7121e9e
commit 5f498cab13
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/tools/miri/src/stacked_borrows/diagnostics.rs
View file

@ -66,13 +66,20 @@ enum InvalidationCause {
impl Invalidation {
fn generate_diagnostic(&self) -> (String, SpanData) {
(
let message = if let InvalidationCause::Retag(_, RetagCause::FnEntry) = self.cause {
// For a FnEntry retag, our Span points at the caller.
// See `DiagnosticCx::log_invalidation`.
format!(
"{:?} was later invalidated at offsets {:?} by a {} inside this call",
self.tag, self.range, self.cause
)
} else {
format!(
"{:?} was later invalidated at offsets {:?} by a {}",
self.tag, self.range, self.cause
),
self.span.data(),
)
)
};
(message, self.span.data())
}
}
@ -82,7 +89,7 @@ impl fmt::Display for InvalidationCause {
InvalidationCause::Access(kind) => write!(f, "{}", kind),
InvalidationCause::Retag(perm, kind) =>
if *kind == RetagCause::FnEntry {
write!(f, "{:?} FnEntry retag inside this call", perm)
write!(f, "{:?} FnEntry retag", perm)
} else {
write!(f, "{:?} retag", perm)
},