Rollup merge of #155630 - Zalathar:skip-filecheck, r=jieyouxu

Make `//@ skip-filecheck` a normal compiletest directive

The `skip-filecheck` directive is currently used by mir-opt tests, to suppress the default behaviour of running LLVM's `FileCheck` tool to check MIR output against FileCheck rules in the test file.

The `skip-filecheck` directive was not included in the big migration to `//@` directive syntax (https://github.com/rust-lang/rust/pull/121370), perhaps because it was parsed and processed in the *miropt-test-tools* helper crate, not in compiletest itself.

Recently I noticed that a small number of *codegen-llvm* tests were using the `//@ build-pass` directive, which has the non-obvious effect of skipping FileCheck in codegen tests. That's quite confusing, so I decided to have the mir-opt tests migrate over to a proper `//@ skip-filecheck` directive, which could then be used by codegen tests as well.

(I also added skip-filecheck support to assembly tests, which are very similar to codegen tests, though there are currently no assembly tests that actually use `//@ skip-filecheck`.)

---

Support for using `//@ build-pass` in codegen tests to skip FileCheck was introduced in https://github.com/rust-lang/rust/pull/113603. With hindsight, I think doing things that way was pretty clearly a  mistake, and we'll be better off with `//@ skip-filecheck`.

r? jieyouxu

src/doc/rustc-dev-guide/src/tests/directives.md

@@ -326,6 +326,8 @@ See [Pretty-printer](compiletest.md#pretty-printer-tests).
 The following directives affect how certain command-line tools are invoked, in
 test suites that use those tools:
 
+- `skip-filecheck` avoids running LLVM's `FileCheck` tool in tests that would normally run it to check output.
+  - Used by codegen tests, assembly tests, and mir-opt tests.
 - `filecheck-flags` adds extra flags when running LLVM's `FileCheck` tool.
   - Used by [codegen tests](compiletest.md#codegen-tests),
   [assembly tests](compiletest.md#assembly-tests), and

src/tools/compiletest/src/directives.rs

@@ -195,6 +195,9 @@ pub(crate) struct TestProps {
     /// Extra flags to pass to `llvm-cov` when producing coverage reports.
     /// Only used by the "coverage-run" test mode.
     pub(crate) llvm_cov_flags: Vec<String>,
+    /// Don't run LLVM's `filecheck` tool to check compiler output,
+    /// in tests that would normally run it.
+    pub(crate) skip_filecheck: bool,
     /// Extra flags to pass to LLVM's `filecheck` tool, in tests that use it.
     pub(crate) filecheck_flags: Vec<String>,
     /// Don't automatically insert any `--check-cfg` args
@@ -308,6 +311,7 @@ pub(crate) fn new() -> Self {
             mir_unit_test: None,
             remap_src_base: false,
             llvm_cov_flags: vec![],
+            skip_filecheck: false,
             filecheck_flags: vec![],
             no_auto_check_cfg: false,
             add_minicore: false,
@@ -438,7 +442,6 @@ fn update_pass_mode(&mut self, ln: &DirectiveLine<'_>, config: &Config) {
         let check_no_run = |s| match (config.mode, s) {
             (TestMode::Ui, _) => (),
             (TestMode::Crashes, _) => (),
-            (TestMode::Codegen, "build-pass") => (),
             (mode, _) => panic!("`{s}` directive is not supported in `{mode}` tests"),
         };
         let pass_mode = if config.parse_name_directive(ln, "check-pass") {

src/tools/compiletest/src/directives/directive_names.rs

@@ -286,6 +286,7 @@
     "rustc-env",
     "rustfix-only-machine-applicable",
     "should-fail",
+    "skip-filecheck",
     "stderr-per-bitwidth",
     "test-mir-pass",
     "unique-doc-out-dir",

src/tools/compiletest/src/directives/handlers.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::sync::{Arc, LazyLock};
 
-use crate::common::Config;
+use crate::common::{Config, TestMode};
 use crate::directives::{
     DirectiveLine, NormalizeKind, NormalizeRule, TestProps, parse_and_update_aux,
     parse_edition_range, split_flags,
@@ -312,6 +312,18 @@ fn make_directive_handlers_map() -> HashMap<&'static str, Handler> {
                 props.llvm_cov_flags.extend(split_flags(&flags));
             }
         }),
+        handler("skip-filecheck", |config, ln, props| {
+            let directive_name = ln.name;
+            // FIXME(Zalathar): Someday we should add unified support for declaring
+            // and checking which modes are supported by each directive.
+            if !matches!(config.mode, TestMode::Assembly | TestMode::Codegen | TestMode::MirOpt) {
+                panic!(
+                    "directive `//@ {directive_name}` is not supported by this test suite (mode: {mode:?})",
+                    mode = config.mode
+                );
+            }
+            config.set_name_directive(ln, directive_name, &mut props.skip_filecheck);
+        }),
         handler(FILECHECK_FLAGS, |config, ln, props| {
             if let Some(flags) = config.parse_name_value_directive(ln, FILECHECK_FLAGS) {
                 props.filecheck_flags.extend(split_flags(&flags));

src/tools/compiletest/src/runtest/assembly.rs

@@ -13,9 +13,11 @@ pub(super) fn run_assembly_test(&self) {
             self.fatal_proc_rec("compilation failed!", &proc_res);
         }
 
-        let proc_res = self.verify_with_filecheck(&output_path);
-        if !proc_res.status.success() {
-            self.fatal_proc_rec("verification with 'FileCheck' failed", &proc_res);
+        if !self.props.skip_filecheck {
+            let proc_res = self.verify_with_filecheck(&output_path);
+            if !proc_res.status.success() {
+                self.fatal_proc_rec("verification with 'FileCheck' failed", &proc_res);
+            }
         }
     }
 

src/tools/compiletest/src/runtest/codegen.rs

@@ -1,4 +1,4 @@
-use super::{PassMode, TestCx};
+use super::TestCx;
 
 impl TestCx<'_> {
     pub(super) fn run_codegen_test(&self) {
@@ -11,12 +11,11 @@ pub(super) fn run_codegen_test(&self) {
             self.fatal_proc_rec("compilation failed!", &proc_res);
         }
 
-        if let Some(PassMode::Build) = self.pass_mode() {
-            return;
-        }
-        let proc_res = self.verify_with_filecheck(&output_path);
-        if !proc_res.status.success() {
-            self.fatal_proc_rec("verification with 'FileCheck' failed", &proc_res);
+        if !self.props.skip_filecheck {
+            let proc_res = self.verify_with_filecheck(&output_path);
+            if !proc_res.status.success() {
+                self.fatal_proc_rec("verification with 'FileCheck' failed", &proc_res);
+            }
         }
     }
 }

src/tools/compiletest/src/runtest/mir_opt.rs

@@ -40,7 +40,7 @@ fn check_mir_dump(&self, test_info: MiroptTest) {
         let test_dir = self.testpaths.file.parent().unwrap();
         let test_crate = self.testpaths.file.file_stem().unwrap().replace('-', "_");
 
-        let MiroptTest { run_filecheck, suffix, files, passes: _ } = test_info;
+        let MiroptTest { suffix, files, passes: _ } = test_info;
 
         if self.config.bless {
             for e in glob(&format!("{}/{}.*{}.mir", test_dir, test_crate, suffix)).unwrap() {
@@ -89,7 +89,7 @@ fn check_mir_dump(&self, test_info: MiroptTest) {
             }
         }
 
-        if run_filecheck {
+        if !self.props.skip_filecheck {
             let output_path = self.output_base_name().with_extension("mir");
             let proc_res = self.verify_with_filecheck(&output_path);
             if !proc_res.status.success() {

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

@@ -8,7 +8,6 @@ pub struct MiroptTestFile {
 }
 
 pub struct MiroptTest {
-    pub run_filecheck: bool,
     pub suffix: String,
     pub files: Vec<MiroptTestFile>,
     /// Vec of passes under test to be dumped
@@ -57,13 +56,15 @@ pub fn files_for_miropt_test(
     let test_crate = testfile.file_stem().unwrap().to_str().unwrap().replace('-', "_");
 
     let suffix = output_file_suffix(testfile, bit_width, panic_strategy);
-    let mut run_filecheck = true;
     let mut passes = Vec::new();
 
     for l in test_file_contents.lines() {
+        // FIXME(Zalathar): Remove this `skip-filecheck` migration error in 2027,
+        // or perhaps earlier if it seems no longer useful.
         if l.starts_with("// skip-filecheck") {
-            run_filecheck = false;
-            continue;
+            panic!(
+                "error: `// skip-filecheck` is no longer supported, use `//@ skip-filecheck` instead."
+            );
         }
         if l.starts_with("// EMIT_MIR ") {
             let test_name = l.trim_start_matches("// EMIT_MIR ").trim();
@@ -128,10 +129,7 @@ pub fn files_for_miropt_test(
 
             out.push(MiroptTestFile { expected_file, from_file, to_file });
         }
-        if !run_filecheck && l.trim_start().starts_with("// CHECK") {
-            panic!("error: test contains filecheck directive but is marked `skip-filecheck`");
-        }
     }
 
-    MiroptTest { run_filecheck, suffix, files: out, passes }
+    MiroptTest { suffix, files: out, passes }
 }

tests/codegen-llvm/scalable-vectors/tuple-intrinsics.rs

@@ -1,4 +1,5 @@
-//@ build-pass
+// FIXME: The FileCheck directives in this test are unchecked and probably broken.
+//@ skip-filecheck
 //@ only-aarch64
 #![crate_type = "lib"]
 #![allow(incomplete_features, internal_features)]

tests/codegen-llvm/simd/simd-wide-sum.rs

@@ -3,7 +3,7 @@
 //@ edition: 2021
 //@ only-x86_64
 //@ [mir-opt3]compile-flags: -Zmir-opt-level=3
-//@ [mir-opt3]build-pass
+//@ [mir-opt3] skip-filecheck
 
 // mir-opt3 is a regression test for https://github.com/rust-lang/rust/issues/98016
 

tests/mir-opt/README.md

@@ -57,7 +57,7 @@ The LLVM FileCheck tool is used to verify the contents of output MIR against `CH
 present in the test file. This works on the runtime MIR, generated by `--emit=mir`, and not
 on the output of a individual passes.
 
-Use `// skip-filecheck` to prevent FileCheck from running.
+Use `//@ skip-filecheck` to prevent FileCheck from running.
 
 To check MIR for function `foo`, start with a `// CHECK-LABEL fn foo(` directive.
 

tests/mir-opt/address_of.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR address_of.address_of_reborrow.SimplifyCfg-initial.after.mir
 
 fn address_of_reborrow() {

tests/mir-opt/async_closure_fake_read_for_by_move.rs

@@ -1,5 +1,5 @@
 //@ edition:2021
-// skip-filecheck
+//@ skip-filecheck
 
 enum Foo {
     Bar,

tests/mir-opt/async_closure_shims.rs

@@ -1,5 +1,5 @@
 //@ edition:2021
-// skip-filecheck
+//@ skip-filecheck
 
 #![allow(unused)]
 

tests/mir-opt/async_drop_live_dead.rs

@@ -1,5 +1,5 @@
 //@ edition:2024
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 
 #![feature(async_drop)]

tests/mir-opt/async_drop_mir_pin.rs

@@ -1,6 +1,6 @@
 //@edition: 2024
 //@ test-mir-pass: MentionedItems
-// skip-filecheck
+//@ skip-filecheck
 #![feature(async_drop)]
 #![allow(incomplete_features)]
 use std::future::AsyncDrop;

tests/mir-opt/box_conditional_drop_allocator.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: ElaborateDrops
 //@ needs-unwind
 #![feature(allocator_api)]

tests/mir-opt/build_correct_coerce.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 
 // Validate that we record the target for the `as` coercion as `for<'a> fn(&'a (), &'a ())`,
 // and not `for<'a, 'b>(&'a (), &'b ())`. We previously did the latter due to a bug in

tests/mir-opt/building/async_await.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // This test makes sure that the coroutine MIR pass eliminates all calls to
 // `get_context`, and that the MIR argument type for an async fn and all locals
 // related to `yield` are `&mut Context`, and its return type is `Poll`.

tests/mir-opt/building/coroutine.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ edition:2024
 //@ compile-flags: -Zmir-opt-level=0 -C panic=abort
 

tests/mir-opt/building/custom/aggregate_exprs.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(custom_mir, core_intrinsics)]
 
 extern crate core;

tests/mir-opt/building/custom/arbitrary_let.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(custom_mir, core_intrinsics)]
 
 extern crate core;

tests/mir-opt/building/custom/arrays.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(custom_mir, core_intrinsics)]
 
 extern crate core;

tests/mir-opt/building/custom/as_cast.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(custom_mir, core_intrinsics)]
 
 extern crate core;

tests/mir-opt/building/custom/assume.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(custom_mir, core_intrinsics)]
 
 extern crate core;

tests/mir-opt/building/custom/composite_return.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(custom_mir, core_intrinsics)]
 
 extern crate core;

tests/mir-opt/building/custom/consts.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(custom_mir, core_intrinsics)]
 
 extern crate core;

tests/mir-opt/building/custom/enums.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(custom_mir, core_intrinsics)]
 
 extern crate core;

tests/mir-opt/building/custom/operators.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ compile-flags: --crate-type=lib
 #![feature(custom_mir, core_intrinsics)]
 use std::intrinsics::mir::*;

tests/mir-opt/building/custom/projections.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(custom_mir, core_intrinsics)]
 
 extern crate core;

tests/mir-opt/building/custom/references.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(custom_mir, core_intrinsics)]
 
 extern crate core;

tests/mir-opt/building/custom/simple_assign.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(custom_mir, core_intrinsics)]
 
 extern crate core;

tests/mir-opt/building/custom/terminators.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(custom_mir, core_intrinsics)]
 
 extern crate core;

tests/mir-opt/building/enum_cast.rs

@@ -1,5 +1,5 @@
 //@ compile-flags: -Zmir-opt-level=0
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR enum_cast.foo.built.after.mir
 // EMIT_MIR enum_cast.bar.built.after.mir
 // EMIT_MIR enum_cast.boo.built.after.mir

tests/mir-opt/building/eq_never_type.rs

@@ -1,5 +1,5 @@
 //@ compile-flags: -Zmir-opt-level=0
-// skip-filecheck
+//@ skip-filecheck
 #![feature(never_type)]
 #![allow(unreachable_code)]
 

tests/mir-opt/building/issue_101867.rs

@@ -1,5 +1,5 @@
 //@ compile-flags: -Zmir-opt-level=0
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR issue_101867.main.built.after.mir
 fn main() {
     let x: Option<u8> = Some(1);

tests/mir-opt/building/issue_110508.rs

@@ -1,5 +1,5 @@
 //@ compile-flags: -Zmir-opt-level=0
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR issue_110508.{impl#0}-BAR.built.after.mir
 // EMIT_MIR issue_110508.{impl#0}-SELF_BAR.built.after.mir
 

tests/mir-opt/building/issue_49232.rs

@@ -1,5 +1,5 @@
 //@ compile-flags: -Zmir-opt-level=0
-// skip-filecheck
+//@ skip-filecheck
 // We must mark a variable whose initialization fails due to an
 // abort statement as StorageDead.
 

tests/mir-opt/building/logical_or_in_conditional.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ compile-flags: -Zmir-opt-level=0 -Z validate-mir
 //@ edition: 2024
 struct Droppy(u8);

tests/mir-opt/building/loop_match_diverges.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![allow(incomplete_features)]
 #![feature(loop_match)]
 #![crate_type = "lib"]

tests/mir-opt/building/match/deref-patterns/string.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ compile-flags: -Z mir-opt-level=0 -C panic=abort
 
 #![feature(deref_patterns)]

tests/mir-opt/building/match/exponential_or.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // Test that simple or-patterns don't get expanded to exponentially large CFGs
 
 // EMIT_MIR exponential_or.match_tuple.SimplifyCfg-initial.after.mir

tests/mir-opt/building/match/match_false_edges.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 fn guard() -> bool {
     false
 }

tests/mir-opt/building/match/simple_match.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // Test that we don't generate unnecessarily large MIR for very simple matches
 
 // EMIT_MIR simple_match.match_bool.built.after.mir

tests/mir-opt/building/receiver_ptr_mutability.rs

@@ -1,5 +1,5 @@
 //@ compile-flags: -Zmir-opt-level=0
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR receiver_ptr_mutability.main.built.after.mir
 
 #![feature(arbitrary_self_types_pointers)]

tests/mir-opt/building/shifts.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ compile-flags: -Zmir-opt-level=0 -C debug-assertions=yes
 
 // EMIT_MIR shifts.shift_signed.built.after.mir

tests/mir-opt/building/storage_live_dead_in_statics.rs

@@ -1,5 +1,5 @@
 //@ compile-flags: -Zmir-opt-level=0
-// skip-filecheck
+//@ skip-filecheck
 // Check that when we compile the static `XXX` into MIR, we do not
 // generate `StorageStart` or `StorageEnd` statements.
 

tests/mir-opt/building/uniform_array_move_out.rs

@@ -1,5 +1,5 @@
 //@ compile-flags: -Zmir-opt-level=0
-// skip-filecheck
+//@ skip-filecheck
 
 // Can't emit `built.after` here as that contains user type annotations which contain DefId that
 // change all the time.

tests/mir-opt/building/user_type_annotations.rs

@@ -1,6 +1,6 @@
 //@ compile-flags: -Zmir-opt-level=0
 //@ edition: 2024
-// skip-filecheck
+//@ skip-filecheck
 
 // This test demonstrates how many user type annotations are recorded in MIR
 // for various binding constructs. In particular, this makes it possible to see

tests/mir-opt/byte_slice.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ compile-flags: -Z mir-opt-level=0
 
 // EMIT_MIR byte_slice.main.SimplifyCfg-pre-optimizations.after.mir

tests/mir-opt/const_allocation.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: GVN
 //@ ignore-endian-big
 // EMIT_MIR_FOR_EACH_BIT_WIDTH

tests/mir-opt/const_allocation2.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: GVN
 //@ ignore-endian-big
 // EMIT_MIR_FOR_EACH_BIT_WIDTH

tests/mir-opt/const_allocation3.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: GVN
 //@ ignore-endian-big
 // EMIT_MIR_FOR_EACH_BIT_WIDTH

tests/mir-opt/const_goto_const_eval_fail.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(min_const_generics)]
 #![crate_type = "lib"]
 

tests/mir-opt/const_promotion_extern_static.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ ignore-endian-big
 extern "C" {
     static X: i32;

tests/mir-opt/const_prop/invalid_constant.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: GVN
 //@ compile-flags: -Zmir-enable-passes=+RemoveZsts -Zdump-mir-exclude-alloc-bytes
 // Verify that we can pretty print invalid constants.

tests/mir-opt/const_prop/large_array_index.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: GVN
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 // EMIT_MIR_FOR_EACH_BIT_WIDTH

tests/mir-opt/const_prop/offset_of.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: GVN
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 

tests/mir-opt/coroutine_drop_cleanup.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 #![feature(coroutines, coroutine_trait, stmt_expr_attributes)]
 
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY

tests/mir-opt/coroutine_storage_dead_unwind.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 
 // Test that we generate StorageDead on unwind paths for coroutines.

tests/mir-opt/coroutine_tiny.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //! Tests that coroutines that cannot return or unwind don't have unnecessary
 //! panic branches.
 

tests/mir-opt/coverage/branch_match_arms.rs

@@ -1,7 +1,7 @@
 #![feature(coverage_attribute)]
 //@ test-mir-pass: InstrumentCoverage
 //@ compile-flags: -Cinstrument-coverage -Zno-profiler-runtime -Zcoverage-options=branch
-// skip-filecheck
+//@ skip-filecheck
 
 enum Enum {
     A(u32),

tests/mir-opt/dataflow.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // Test graphviz dataflow output
 //@ compile-flags: -Z dump-mir=main -Z dump-mir-dataflow
 

tests/mir-opt/derefer_complex_case.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: Derefer
 // EMIT_MIR derefer_complex_case.main.Derefer.diff
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY

tests/mir-opt/derefer_inline_test.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: Derefer
 // EMIT_MIR derefer_inline_test.main.Derefer.diff
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY

tests/mir-opt/derefer_terminator_test.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: Derefer
 // EMIT_MIR derefer_terminator_test.main.Derefer.diff
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY

tests/mir-opt/derefer_test.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: Derefer
 // EMIT_MIR derefer_test.main.Derefer.diff
 fn main() {

tests/mir-opt/derefer_test_multiple.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: Derefer
 // EMIT_MIR derefer_test_multiple.main.Derefer.diff
 fn main() {

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

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 //@ test-mir-pass: DestinationPropagation
 

tests/mir-opt/dont_inline_type_id.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: Inline
 //@ compile-flags: --crate-type=lib -C panic=abort
 

tests/mir-opt/elaborate_box_deref_in_debuginfo.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: ElaborateBoxDerefs
 
 #![feature(custom_mir, core_intrinsics)]

tests/mir-opt/enum_opt.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: EnumSizeOpt
 // EMIT_MIR_FOR_EACH_BIT_WIDTH
 //@ compile-flags: -Zunsound-mir-opts

tests/mir-opt/fn_ptr_shim.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ compile-flags: -Zmir-opt-level=0
 
 // Tests that the `<fn() as Fn>` shim does not create a `Call` terminator with a `Self` callee

tests/mir-opt/funky_arms.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 // EMIT_MIR_FOR_EACH_BIT_WIDTH
 

tests/mir-opt/global_asm.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ needs-asm-support
 
 // `global_asm!` gets a fake body, make sure it is handled correctly

tests/mir-opt/graphviz.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // Test graphviz output
 //@ compile-flags: -Z dump-mir-graphviz
 

tests/mir-opt/gvn_on_unsafe_binder.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: GVN
 
 // EMIT_MIR gvn_on_unsafe_binder.test.GVN.diff

tests/mir-opt/gvn_ptr_eq_with_constant.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: GVN
 //@ only-64bit
 //@ compile-flags: -Z mir-enable-passes=+Inline

tests/mir-opt/gvn_uninhabited.rs

@@ -1,7 +1,7 @@
 //@ test-mir-pass: GVN
 //@ compile-flags: -O
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
-// skip-filecheck
+//@ skip-filecheck
 
 #![feature(never_type)]
 

tests/mir-opt/impossible_predicates.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR impossible_predicates.impossible_predicate.ImpossiblePredicates.diff
 
 pub fn impossible_predicate(x: &mut i32) -> (&mut i32, &mut i32)

tests/mir-opt/inline/inline_async.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // Checks that inliner doesn't introduce cycles when optimizing coroutines.
 // The outcome of optimization is not verfied, just the absence of the cycle.
 // Regression test for #76181.

tests/mir-opt/inline/inline_cycle.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ compile-flags: -C debuginfo=full
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 // Check that inliner handles various forms of recursion and doesn't fall into

tests/mir-opt/inline/inline_cycle_generic.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 // Check that inliner handles various forms of recursion and doesn't fall into
 // an infinite inlining cycle. The particular outcome of inlining is not

tests/mir-opt/inline/polymorphic_recursion.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // Make sure that the MIR inliner does not loop indefinitely on polymorphic recursion.
 //@ compile-flags: --crate-type lib
 

tests/mir-opt/inline/recursion_limit_prevents_cycle_discovery.rs

@@ -1,6 +1,6 @@
 //@ aux-build: wrapper.rs
 //@ compile-flags: -Zmir-opt-level=2 -Zinline-mir
-// skip-filecheck
+//@ skip-filecheck
 
 // This is a regression test for https://github.com/rust-lang/rust/issues/146998
 

tests/mir-opt/inline/type_overflow.rs

@@ -1,7 +1,7 @@
 // This is a regression test for one of the problems in #128887; it checks that the
 // strategy in #129714 avoids trait solver overflows in this specific case.
 
-// skip-filecheck
+//@ skip-filecheck
 //@ compile-flags: -Zinline-mir
 
 pub trait Foo {

tests/mir-opt/inline/unit_test.rs

@@ -1,6 +1,6 @@
 // Check that `-Zmir-enable-passes=+Inline` does not ICE because of stolen MIR.
 //@ test-mir-pass: Inline
-// skip-filecheck
+//@ skip-filecheck
 #![crate_type = "lib"]
 
 // Randomize `def_path_hash` by defining them under a module with different names

tests/mir-opt/inline_coroutine_body.rs

@@ -1,5 +1,5 @@
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: Inline
 //@ edition: 2021
 //@ compile-flags: -Zinline-mir-hint-threshold=10000 -Zinline-mir-threshold=10000 --crate-type=lib

tests/mir-opt/inline_default_trait_body.rs

@@ -1,5 +1,5 @@
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: Inline
 //@ edition: 2021
 //@ compile-flags: -Zinline-mir --crate-type=lib

tests/mir-opt/inline_double_cycle.rs

@@ -1,5 +1,5 @@
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: Inline
 //@ edition: 2021
 //@ compile-flags: -Zinline-mir --crate-type=lib

tests/mir-opt/inline_generically_if_sized.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ test-mir-pass: Inline
 //@ compile-flags: --crate-type=lib -C panic=abort
 

tests/mir-opt/issue_101973.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 //@ compile-flags: -O -C debug-assertions=on
 // This needs inlining followed by GVN to reproduce, so we cannot use "test-mir-pass".

tests/mir-opt/issue_104451_unwindable_intrinsics.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // Check that `UnwindAction::Unreachable` is not generated for unwindable intrinsics.
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 #![feature(core_intrinsics)]

tests/mir-opt/issue_120925_unsafefncast.rs

@@ -1,5 +1,5 @@
 // Verify that we do not ICE when attempting to interpret casts between fn types.
-// skip-filecheck
+//@ skip-filecheck
 
 static FOO: fn() = || assert_ne!(42, 43);
 static BAR: fn(i32, i32) = |a, b| assert_ne!(a, b);

tests/mir-opt/issue_38669.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // check that we don't StorageDead booleans before they are used
 
 // EMIT_MIR issue_38669.main.SimplifyCfg-initial.after.mir

tests/mir-opt/issue_41110.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 
 // check that we don't emit multiple drop flags when they are not needed.

tests/mir-opt/issue_41697.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // Regression test for #41697. Using dump-mir was triggering
 // artificial cycles: during type-checking, we had to get the MIR for
 // the constant expressions in `[u8; 2]`, which in turn would trigger

tests/mir-opt/issue_41888.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 // check that we clear the "ADT master drop flag" even when there are
 // no fields to be dropped.

tests/mir-opt/issue_62289.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 // check that we don't forget to drop the Box if we early return before
 // initializing it
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY

tests/mir-opt/issue_72181.rs

@@ -1,4 +1,4 @@
-// skip-filecheck
+//@ skip-filecheck
 //@ compile-flags: -Z mir-opt-level=1
 // Regression test for #72181, this ICE requires `-Z mir-opt-level=1` flags.