Skip to content

Commit 8c1f295

Browse files
authored
Unrolled build for rust-lang#131927
Rollup merge of rust-lang#131927 - clubby789:skip-filecheck-directives, r=Mark-Simulacrum Check for filecheck directives in files marked `skip-filecheck` cc rust-lang#116971
2 parents 662180b + ebfe0e4 commit 8c1f295

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/tools/miropt-test-tools/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ pub fn files_for_miropt_test(
129129

130130
out.push(MiroptTestFile { expected_file, from_file, to_file });
131131
}
132+
if !run_filecheck && l.trim_start().starts_with("// CHECK") {
133+
panic!("error: test contains filecheck directive but is marked `skip-filecheck`");
134+
}
132135
}
133136

134137
MiroptTest { run_filecheck, suffix, files: out, passes }

tests/mir-opt/dest-prop/union.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// skip-filecheck
21
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
32
//! Tests that we can propagate into places that are projections into unions
43
//@ compile-flags: -Zunsound-mir-opts -C debuginfo=full
@@ -8,7 +7,7 @@ fn val() -> u32 {
87

98
// EMIT_MIR union.main.DestinationPropagation.diff
109
fn main() {
11-
// CHECK-LABEL: fn args(
10+
// CHECK-LABEL: fn main(
1211
// CHECK: {{_.*}} = Un { us: const 1_u32 };
1312
union Un {
1413
us: u32,

tests/mir-opt/issues/issue_59352.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// skip-filecheck
21
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
32
// This test is a mirror of codegen/issue-59352.rs.
43
// The LLVM inliner doesn't inline `char::method::is_digit()` and so it doesn't recognize this case

0 commit comments

Comments
 (0)