Skip to content

Commit 9ec98d9

Browse files
committed
Auto merge of #111506 - RalfJung:miri, r=oli-obk
update Miri and run mir-opt-level=4 tests in rustc CI so issues like rust-lang/rust#111422 are caught before they land. r? `@oli-obk` due to the bootstrap changes
2 parents 240e314 + 1e119e0 commit 9ec98d9

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

ci.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ function run_tests {
4545
# them. Also error locations change so we don't run the failing tests.
4646
# We explicitly enable debug-assertions here, they are disabled by -O but we have tests
4747
# which exist to check that we panic on debug assertion failures.
48-
#FIXME: Disabled due to <https://github.com/rust-lang/rust/issues/111422>.
49-
#MIRIFLAGS="${MIRIFLAGS:-} -O -Zmir-opt-level=4 -Cdebug-assertions=yes" MIRI_SKIP_UI_CHECKS=1 ./miri test -- tests/{pass,panic}
48+
MIRIFLAGS="${MIRIFLAGS:-} -O -Zmir-opt-level=4 -Cdebug-assertions=yes" MIRI_SKIP_UI_CHECKS=1 ./miri test -- tests/{pass,panic}
5049

5150
# Also run some many-seeds tests. 64 seeds means this takes around a minute per test.
5251
for FILE in tests/many-seeds/*.rs; do

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
65dfca8488d635552eb246eb8e15df646e987cff
1+
0b795044c6f0854445f1f2bb6443e87848e150d1

tests/compiletest.rs

+2
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ fn run_tests(mode: Mode, path: &str, target: &str, with_dependencies: bool) -> R
140140
"run".into(), // There is no `cargo miri build` so we just use `cargo miri run`.
141141
];
142142
}
143+
144+
eprintln!(" Compiler: {}", config.program.display());
143145
ui_test::run_tests_generic(
144146
config,
145147
// The files we're actually interested in (all `.rs` files).

tests/fail/intrinsics/simd-scatter.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ fn main() {
55
unsafe {
66
let mut vec: Vec<i8> = vec![10, 11, 12, 13, 14, 15, 16, 17, 18];
77
let idxs = Simd::from_array([9, 3, 0, 17]);
8-
Simd::from_array([-27, 82, -41, 124]).scatter_select_unchecked( //~ERROR: pointer to 1 byte starting at offset 9 is out-of-bounds
8+
Simd::from_array([-27, 82, -41, 124]).scatter_select_unchecked(
9+
//~^ERROR: pointer to 1 byte starting at offset 9 is out-of-bounds
910
&mut vec,
1011
Mask::splat(true),
1112
idxs,

tests/fail/intrinsics/simd-scatter.stderr

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ error: Undefined Behavior: dereferencing pointer failed: ALLOC has size 9, so po
22
--> $DIR/simd-scatter.rs:LL:CC
33
|
44
LL | / Simd::from_array([-27, 82, -41, 124]).scatter_select_unchecked(
5+
LL | |
56
LL | | &mut vec,
67
LL | | Mask::splat(true),
78
LL | | idxs,

0 commit comments

Comments
 (0)