Skip to content

Commit d81aa36

Browse files
authored
Rollup merge of rust-lang#101435 - JakobDegen:bitwidth-tests, r=wesleywiser
Remove unnecessary `EMIT_MIR_FOR_EACH_BITWIDTH` This commit removes the annotation only for those tests where the 32 bit and 64 bit files were exactly identical. I didn't touch anything in the `mir-opt/const` directory, since having this annotation there seems more principled, even if it doesn't make a difference. This also removes four additional files related to the `separate_const_switch.rs` test. The associated annotations were removed in rust-lang#100827 , but I forgot to remove the files as well. (rust-lang#97564 is the issue tracking an automated check here) r? ``@wesleywiser``
2 parents bec796a + 46130a1 commit d81aa36

File tree

61 files changed

+12
-1598
lines changed

Some content is hidden

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

61 files changed

+12
-1598
lines changed

src/test/mir-opt/array-index-is-temporary.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ unsafe fn foo(z: *mut usize) -> u32 {
77
99
88
}
99

10-
// EMIT_MIR_FOR_EACH_BIT_WIDTH
10+
1111
// EMIT_MIR array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir
1212
fn main() {
1313
let mut x = [42, 43, 44];

src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.64bit.mir

-64
This file was deleted.

src/test/mir-opt/inline/inline-into-box-place.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-endian-big
22
// ignore-wasm32-bare compiled with panic=abort by default
33
// compile-flags: -Z mir-opt-level=4
4-
// EMIT_MIR_FOR_EACH_BIT_WIDTH
4+
55
#![feature(box_syntax)]
66
// EMIT_MIR inline_into_box_place.main.Inline.diff
77
fn main() {

src/test/mir-opt/inline/inline_into_box_place.main.Inline.64bit.diff

-82
This file was deleted.

src/test/mir-opt/issue-41697.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ trait Foo {
1313
fn get(&self) -> [u8; 2];
1414
}
1515

16-
// EMIT_MIR_FOR_EACH_BIT_WIDTH
16+
1717
// EMIT_MIR issue_41697.{impl#0}-{constant#0}.SimplifyCfg-promote-consts.after.mir
1818
impl Foo for [u8; 1+1] {
1919
fn get(&self) -> [u8; 2] {

src/test/mir-opt/issue-72181.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ union Foo {
1111
b: Never
1212
}
1313

14-
// EMIT_MIR_FOR_EACH_BIT_WIDTH
14+
1515
// EMIT_MIR issue_72181.foo.mir_map.0.mir
1616
fn foo(xs: [(Never, u32); 1]) -> u32 { xs[0].1 }
1717

1818
// EMIT_MIR issue_72181.bar.mir_map.0.mir
1919
fn bar([(_, x)]: [(Never, u32); 1]) -> u32 { x }
2020

21-
// EMIT_MIR_FOR_EACH_BIT_WIDTH
21+
2222
// EMIT_MIR issue_72181.main.mir_map.0.mir
2323
fn main() {
2424
let _ = mem::size_of::<Foo>();

src/test/mir-opt/issue-73223.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ fn main() {
88
assert_eq!(split, 1);
99
}
1010

11-
// EMIT_MIR_FOR_EACH_BIT_WIDTH
11+
1212
// EMIT_MIR issue_73223.main.SimplifyArmIdentity.diff

src/test/mir-opt/issue_41697.{impl#0}-{constant#0}.SimplifyCfg-promote-consts.after.64bit.mir

-20
This file was deleted.

src/test/mir-opt/issue_72181.bar.mir_map.0.64bit.mir

-17
This file was deleted.

src/test/mir-opt/issue_72181.foo.mir_map.0.64bit.mir

-27
This file was deleted.

src/test/mir-opt/issue_72181.main.mir_map.0.64bit.mir

-62
This file was deleted.

0 commit comments

Comments
 (0)