Use the better FnEntry spans in protector errors #2519
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
saethlin
commented
Aug 29, 2022
Comment on lines
+330
to
+340
| }).or_else(|| { | ||
| // If we didn't find a retag that created this tag, it might be the base tag of | ||
| // this allocation. | ||
| if self.history.base.0.tag() == tag { | ||
| Some(( | ||
| format!("{:?} was created here, as a base tag for {:?}", tag, self.history.id), | ||
| self.history.base.1.data() | ||
| )) | ||
| } else { | ||
| None | ||
| } |
There was a problem hiding this comment.
While developing this, I tried the reproducer for the current VecDeque issue:
use std::collections::VecDeque;
fn main() {
let mut tester: VecDeque<usize> = VecDeque::with_capacity(3);
for i in 0..3 {
tester.push_back(i);
}
let _: VecDeque<_> = tester.drain(1..2).collect();
}Which before this PR reports no additional helps, because it fails to find the creation of the tag being used in the error. Because the tag being used is the base tag, which we never store anywhere.
oli-obk
reviewed
Aug 30, 2022
| // this allocation. | ||
| if self.history.base.0.tag() == tag { | ||
| Some(( | ||
| format!("{:?} was created here, as a base tag for {:?}", tag, self.history.id), |
There was a problem hiding this comment.
None of the tests emit this message, is it reachable at all?
|
☀️ Test successful - checks-actions |
|
Will do. |
bors
added a commit
that referenced
this pull request
Sep 1, 2022
Add a protector test that demonstrates the base tag diagnostic Per #2519 (comment), this demonstrates this case for protector diagnostics: ``` help: <3131> was created here, as a base tag for alloc1623 --> tests/fail/stacked_borrows/invalidate_against_protector3.rs:10:19 | 10 | let ptr = std::alloc::alloc(std::alloc::Layout::for_value(&0i32)) as *mut i32; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``` This diagnostic is inspired by what Miri used to do with rust-lang/rust#60076 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Example error, from
tests/fail/stacked_borrows/invalidate_against_protector1.rs:Benchmarks report no change, within noise.