Skip to content

Commit f07607f

Browse files
committed
Move mir-opt tests to toplevel
1 parent 86be22e commit f07607f

File tree

195 files changed

+68
-275
lines changed

Some content is hidden

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

195 files changed

+68
-275
lines changed

Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,7 @@ dependencies = [
611611
"diff",
612612
"env_logger 0.7.1",
613613
"getopts",
614+
"glob",
614615
"lazy_static",
615616
"libc",
616617
"log",

fuckyou.rb

-7
This file was deleted.

omg.mir

-2
This file was deleted.

src/librustc_mir/util/pretty.rs

+9-2
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,15 @@ fn dump_path(
197197
};
198198

199199
let file_name = format!(
200-
"{}.{}{}{}{}.{}.{}.{}", crate_name,
201-
item_name, shim_disambiguator, promotion_id, pass_num, pass_name, disambiguator, extension,
200+
"{}.{}{}{}{}.{}.{}.{}",
201+
crate_name,
202+
item_name,
203+
shim_disambiguator,
204+
promotion_id,
205+
pass_num,
206+
pass_name,
207+
disambiguator,
208+
extension,
202209
);
203210

204211
file_path.push(&file_name);

src/test/mir-opt/instrument_coverage/rustc.bar.InstrumentCoverage.diff renamed to src/test/mir-opt/instrument_coverage.bar.InstrumentCoverage.diff

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
bb0: {
99
+ StorageLive(_1); // scope 0 at $DIR/instrument_coverage.rs:18:18: 18:18
10-
+ _1 = const std::intrinsics::count_code_region(const 10208505205182607101_u64, const 0_u32, const 501_u32, const 513_u32) -> bb2; // scope 0 at $DIR/instrument_coverage.rs:18:18: 18:18
10+
+ _1 = const std::intrinsics::count_code_region(const 10208505205182607101_u64, const 0_u32, const 529_u32, const 541_u32) -> bb2; // scope 0 at $DIR/instrument_coverage.rs:18:18: 18:18
1111
+ // ty::Const
1212
+ // + ty: unsafe extern "rust-intrinsic" fn(u64, u32, u32, u32) {std::intrinsics::count_code_region}
1313
+ // + val: Value(Scalar(<ZST>))
@@ -28,16 +28,16 @@
2828
+ // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
2929
+ // ty::Const
3030
+ // + ty: u32
31-
+ // + val: Value(Scalar(0x000001f5))
31+
+ // + val: Value(Scalar(0x00000211))
3232
+ // mir::Constant
3333
+ // + span: $DIR/instrument_coverage.rs:18:18: 18:18
34-
+ // + literal: Const { ty: u32, val: Value(Scalar(0x000001f5)) }
34+
+ // + literal: Const { ty: u32, val: Value(Scalar(0x00000211)) }
3535
+ // ty::Const
3636
+ // + ty: u32
37-
+ // + val: Value(Scalar(0x00000201))
37+
+ // + val: Value(Scalar(0x0000021d))
3838
+ // mir::Constant
3939
+ // + span: $DIR/instrument_coverage.rs:18:18: 18:18
40-
+ // + literal: Const { ty: u32, val: Value(Scalar(0x00000201)) }
40+
+ // + literal: Const { ty: u32, val: Value(Scalar(0x0000021d)) }
4141
+ }
4242
+
4343
+ bb1 (cleanup): {

src/test/mir-opt/instrument_coverage/rustc.main.InstrumentCoverage.diff renamed to src/test/mir-opt/instrument_coverage.main.InstrumentCoverage.diff

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
bb0: {
1212
- falseUnwind -> [real: bb1, cleanup: bb2]; // scope 0 at $DIR/instrument_coverage.rs:10:5: 14:6
1313
+ StorageLive(_4); // scope 0 at $DIR/instrument_coverage.rs:9:11: 9:11
14-
+ _4 = const std::intrinsics::count_code_region(const 16004455475339839479_u64, const 0_u32, const 397_u32, const 465_u32) -> bb7; // scope 0 at $DIR/instrument_coverage.rs:9:11: 9:11
14+
+ _4 = const std::intrinsics::count_code_region(const 16004455475339839479_u64, const 0_u32, const 425_u32, const 493_u32) -> bb7; // scope 0 at $DIR/instrument_coverage.rs:9:11: 9:11
1515
+ // ty::Const
1616
+ // + ty: unsafe extern "rust-intrinsic" fn(u64, u32, u32, u32) {std::intrinsics::count_code_region}
1717
+ // + val: Value(Scalar(<ZST>))
@@ -32,16 +32,16 @@
3232
+ // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
3333
+ // ty::Const
3434
+ // + ty: u32
35-
+ // + val: Value(Scalar(0x0000018d))
35+
+ // + val: Value(Scalar(0x000001a9))
3636
+ // mir::Constant
3737
+ // + span: $DIR/instrument_coverage.rs:9:11: 9:11
38-
+ // + literal: Const { ty: u32, val: Value(Scalar(0x0000018d)) }
38+
+ // + literal: Const { ty: u32, val: Value(Scalar(0x000001a9)) }
3939
+ // ty::Const
4040
+ // + ty: u32
41-
+ // + val: Value(Scalar(0x000001d1))
41+
+ // + val: Value(Scalar(0x000001ed))
4242
+ // mir::Constant
4343
+ // + span: $DIR/instrument_coverage.rs:9:11: 9:11
44-
+ // + literal: Const { ty: u32, val: Value(Scalar(0x000001d1)) }
44+
+ // + literal: Const { ty: u32, val: Value(Scalar(0x000001ed)) }
4545
}
4646

4747
bb1: {

src/test/mir-opt/issue-72181/rustc.bar.mir_map.0.mir

-25
This file was deleted.

src/test/mir-opt/issue-72181/rustc.foo.mir_map.0.mir

-37
This file was deleted.

src/test/mir-opt/issue-72181/rustc.main.mir_map.0.mir

-93
This file was deleted.

src/test/mir-opt/simplify-arm-identity/rustc.main.SimplifyArmIdentity.diff

-70
This file was deleted.

src/tools/compiletest/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ serde_json = "1.0"
1515
rustfix = "0.5.0"
1616
lazy_static = "1.0"
1717
walkdir = "2"
18+
glob = "0.3.0"
1819

1920
[target.'cfg(unix)'.dependencies]
2021
libc = "0.2"

0 commit comments

Comments
 (0)