Skip to content

Commit 3cfc4b3

Browse files
committed
Address merge conflict in MIR instrument_coverage test
The MIR test output format changed for int types.
1 parent 1c43f4c commit 3cfc4b3

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
bb0: {
99
+ StorageLive(_1); // scope 0 at $DIR/instrument_coverage.rs:18:1: 20:2
10-
+ _1 = const std::intrinsics::count_code_region(const 0_u32) -> bb2; // scope 0 at $DIR/instrument_coverage.rs:18:1: 20:2
11-
+ _1 = const std::intrinsics::count_code_region(const 0u32, const 484u32, const 513u32) -> bb2; // scope 0 at $DIR/instrument_coverage.rs:18:1: 20:2
10+
+ _1 = const std::intrinsics::count_code_region(const 0_u32, const 484_u32, const 513_u32) -> bb2; // scope 0 at $DIR/instrument_coverage.rs:18:1: 20:2
1211
+ // ty::Const
1312
+ // + ty: unsafe extern "rust-intrinsic" fn(u32, u32, u32) {std::intrinsics::count_code_region}
1413
+ // + val: Value(Scalar(<ZST>))

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +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:1: 15:2
14-
+ _4 = const std::intrinsics::count_code_region(const 0_u32) -> bb7; // scope 0 at $DIR/instrument_coverage.rs:9:1: 15:2
15-
+ _4 = const std::intrinsics::count_code_region(const 0u32, const 387u32, const 465u32) -> bb7; // scope 0 at $DIR/instrument_coverage.rs:9:1: 15:2
14+
+ _4 = const std::intrinsics::count_code_region(const 0_u32, const 387_u32, const 465_u32) -> bb7; // scope 0 at $DIR/instrument_coverage.rs:9:1: 15:2
1615
+ // ty::Const
1716
+ // + ty: unsafe extern "rust-intrinsic" fn(u32, u32, u32) {std::intrinsics::count_code_region}
1817
+ // + val: Value(Scalar(<ZST>))

0 commit comments

Comments
 (0)