Skip to content

Miri subtree update #117165

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

Merged
merged 24 commits into from
Oct 25, 2023
Merged

Miri subtree update #117165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
48445b9
avoid a linear scan over the entire int_to_ptr_map on each deallocation
RalfJung Oct 22, 2023
74092c5
Auto merge of #3134 - RalfJung:log-not-lin, r=saethlin
bors Oct 22, 2023
a80b5c0
Preparing for merge from rustc
Oct 23, 2023
624f68d
Merge from rustc
Oct 23, 2023
dd683dd
fmt
Oct 23, 2023
d32b158
Auto merge of #3136 - rust-lang:rustup-2023-10-23, r=RalfJung
bors Oct 23, 2023
a4e42ad
data_race: clarify and slightly refactor non-atomic handling
RalfJung Oct 22, 2023
f99566e
data_race: detect races between atomic and non-atomic accesses, even …
RalfJung Oct 23, 2023
1e5f9eb
detect mixed-size atomic accesses
RalfJung Oct 23, 2023
369c6d1
clean up imperfect overlap detection in weak-mem emulation
RalfJung Oct 23, 2023
e94c18e
don't talk about 'Data race' when both accesses are atomic
RalfJung Oct 23, 2023
e42a8d8
Preparing for merge from rustc
Oct 24, 2023
ddc76e2
Merge from rustc
Oct 24, 2023
cc13d04
Auto merge of #3138 - rust-lang:rustup-2023-10-24, r=RalfJung
bors Oct 24, 2023
f15b563
fix error read-read reporting when there's also an unsynchronized non…
RalfJung Oct 24, 2023
d3a8281
futex text: avoid spurious non-atomic reads
RalfJung Oct 24, 2023
900b5ef
we don't support thread::scope on freebsd
RalfJung Oct 24, 2023
a15eb7e
Auto merge of #3137 - RalfJung:data-race, r=oli-obk
bors Oct 24, 2023
e83c8c1
add some more gamma function tests
RalfJung Oct 25, 2023
c612ba8
Preparing for merge from rustc
Oct 25, 2023
9c793e1
Auto merge of #3140 - RalfJung:gamma, r=RalfJung
bors Oct 25, 2023
3751fb0
Merge from rustc
Oct 25, 2023
19c4fa6
CLOCK_UPTIME_RAW exists on all macos targets, not just the ARM ones
RalfJung Oct 25, 2023
51ae1fe
Auto merge of #3141 - rust-lang:rustup-2023-10-25, r=RalfJung
bors Oct 25, 2023
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
2 changes: 1 addition & 1 deletion src/tools/miri/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ case $HOST_TARGET in
MIRI_TEST_TARGET=aarch64-unknown-linux-gnu run_tests
MIRI_TEST_TARGET=aarch64-apple-darwin run_tests
MIRI_TEST_TARGET=i686-pc-windows-gnu run_tests
MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal hello integer vec panic/panic concurrency/simple atomic data_race env/var
MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal hello integer vec panic/panic concurrency/simple atomic env/var
MIRI_TEST_TARGET=aarch64-linux-android run_tests_minimal hello integer vec panic/panic
MIRI_TEST_TARGET=wasm32-wasi run_tests_minimal no_std integer strings wasm
MIRI_TEST_TARGET=wasm32-unknown-unknown run_tests_minimal no_std integer strings wasm
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri/rust-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9e3f784eb2c7c847b6c3578b373c0e0bc9233ca3
2e4e2a8f288f642cafcc41fff211955ceddc453d
12 changes: 5 additions & 7 deletions src/tools/miri/src/borrow_tracker/tree_borrows/tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,13 +661,11 @@ impl<'tcx> Tree {
for (perms_range, perms) in self.rperms.iter_mut_all() {
let idx = self.tag_mapping.get(&tag).unwrap();
// Only visit initialized permissions
if let Some(p) = perms.get(idx) && p.initialized {
TreeVisitor {
nodes: &mut self.nodes,
tag_mapping: &self.tag_mapping,
perms,
}
.traverse_nonchildren(
if let Some(p) = perms.get(idx)
&& p.initialized
{
TreeVisitor { nodes: &mut self.nodes, tag_mapping: &self.tag_mapping, perms }
.traverse_nonchildren(
tag,
|args| node_app(perms_range.clone(), args),
|args| err_handler(perms_range.clone(), args),
Expand Down
Loading