Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update miri submodule #101522

Merged
merged 1 commit into from
Sep 7, 2022
+4 −2
Merged

Update miri submodule #101522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion compiler/rustc_middle/src/mir/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,9 @@ impl<'tcx> Place<'tcx> {
/// It's guaranteed to be in the first place
pub fn has_deref(&self) -> bool {
// To make sure this is not accidently used in wrong mir phase
debug_assert!(!self.projection[1..].contains(&PlaceElem::Deref));
debug_assert!(
self.projection.is_empty() || !self.projection[1..].contains(&PlaceElem::Deref)
);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, so that was the actual cause of the strange ICE...
Cc @ouz-a

Copy link
Contributor

@ouz-a ouz-a Sep 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder how this slipped without causing any issues until now. This should have been the default behavior...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the ui test suite never hits the code path where this is empty.

self.projection.first() == Some(&PlaceElem::Deref)
}

Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Open in desktop
Submodule miri updated 6 files
+1 −1 rust-version
+9 −2 src/eval.rs
+23 −10 src/shims/windows/foreign_items.rs
+1 −1 tests/fail/intrinsics/assume.rs
+2 −2 tests/fail/intrinsics/assume.stderr
+0 −22 tests/panic/panic1.stderr