Skip to content

Commit fa9a333

Browse files
committed
Auto merge of #111454 - RalfJung:miri, r=RalfJung
update Miri r? `@ghost`
2 parents 63901bb + db47d60 commit fa9a333

File tree

108 files changed

+1120
-409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1120
-409
lines changed

Cargo.lock

Lines changed: 277 additions & 87 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ libloading = "0.7"
3939

4040
[dev-dependencies]
4141
colored = "2"
42-
ui_test = "0.6.2"
42+
ui_test = "0.9"
4343
rustc_version = "0.4"
4444
# Features chosen to match those required by env_logger, to avoid rebuilds
4545
regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ to Miri failing to detect cases of undefined behavior in a program.
389389
Follow [the discussion on supporting other types](https://github.com/rust-lang/miri/issues/2365).
390390
* `-Zmiri-measureme=<name>` enables `measureme` profiling for the interpreted program.
391391
This can be used to find which parts of your program are executing slowly under Miri.
392-
The profile is written out to a file with the prefix `<name>`, and can be processed
392+
The profile is written out to a file inside a directory called `<name>`, and can be processed
393393
using the tools in the repository https://github.com/rust-lang/measureme.
394394
* `-Zmiri-mute-stdout-stderr` silently ignores all writes to stdout and stderr,
395395
but reports to the program that it did actually write. This is useful when you

bench-cargo-miri/zip-equal/Cargo.lock

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bench-cargo-miri/zip-equal/Cargo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[package]
2+
name = "zip-equal"
3+
version = "0.1.0"
4+
edition = "2021"
5+
6+
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
7+
8+
[dependencies]
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
//! This is a pathological pattern in which opportunities to merge
2+
//! adjacent identical items in the RangeMap are not properly detected
3+
//! because `RangeMap::iter_mut` is never called on overlapping ranges
4+
//! and thus never merges previously split ranges. This does not produce any
5+
//! additional cost for access operations, but it makes the job of the Tree Borrows
6+
//! GC procedure much more costly.
7+
//! See https://github.com/rust-lang/miri/issues/2863
8+
9+
const LENGTH: usize = (1 << 14) - 1;
10+
const LONG: &[u8] = &[b'x'; LENGTH];
11+
12+
fn main() {
13+
assert!(eq(LONG, LONG))
14+
}
15+
16+
fn eq(s1: &[u8], s2: &[u8]) -> bool {
17+
if s1.len() != s2.len() {
18+
return false;
19+
}
20+
21+
s1.iter().zip(s2).all(|(c1, c2)| *c1 == *c2)
22+
}

0 commit comments

Comments
 (0)