Auto merge of #66932 - rust-lang:pass-check-runfail, r=petrochenkov

Revamp `// run-fail` wrt. `--pass` & support `// build-fail` & `// check-fail`

Revamp how `// run-fail` tests work internally by having a separate `FailMode` that does not interfere with `PassMode`. In particular, `--pass check` will now have no effect on `// *-fail` tests. Moreover, new test annotations `// check-fail` (the default) and `// build-fail` are added. The latter is useful to distinguish post-monomorphization failures from pre-monomorphization failures as seen throughout the PR. Finally, ensure that non-`Ui` tests do not listen to `--pass check` such that the flag can be used with e.g. `./x.py test --pass check` directly.

Fixes #66929.
Fixes #67128.

r? @petrochenkov
cc @RalfJung @ninjasource

Author: bors

src/test/ui/asm/issue-51431.rs

@@ -1,3 +1,4 @@
+// build-fail
 // ignore-emscripten no asm! support
 
 #![feature(asm)]

src/test/ui/asm/issue-51431.stderr

@@ -1,5 +1,5 @@
 error[E0669]: invalid value for constraint in inline assembly
-  --> $DIR/issue-51431.rs:7:32
+  --> $DIR/issue-51431.rs:8:32
    |
 LL |         asm! {"mov $0,$1"::"0"("bx"),"1"(0x00)}
    |                                ^^^^

src/test/ui/bad/bad-intrinsic-monomorphization.rs

@@ -1,3 +1,5 @@
+// build-fail
+
 #![feature(repr_simd, platform_intrinsics, core_intrinsics)]
 #![allow(warnings)]
 #![crate_type = "rlib"]

src/test/ui/bad/bad-intrinsic-monomorphization.stderr

@@ -1,17 +1,17 @@
 error[E0511]: invalid monomorphization of `cttz` intrinsic: expected basic integer type, found `Foo`
-  --> $DIR/bad-intrinsic-monomorphization.rs:18:5
+  --> $DIR/bad-intrinsic-monomorphization.rs:20:5
    |
 LL |     intrinsics::cttz(v)
    |     ^^^^^^^^^^^^^^^^^^^
 
 error[E0511]: invalid monomorphization of `fadd_fast` intrinsic: expected basic float type, found `Foo`
-  --> $DIR/bad-intrinsic-monomorphization.rs:23:5
+  --> $DIR/bad-intrinsic-monomorphization.rs:25:5
    |
 LL |     intrinsics::fadd_fast(a, b)
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0511]: invalid monomorphization of `simd_add` intrinsic: expected SIMD input type, found non-SIMD `Foo`
-  --> $DIR/bad-intrinsic-monomorphization.rs:28:5
+  --> $DIR/bad-intrinsic-monomorphization.rs:30:5
    |
 LL |     simd_add(a, b)
    |     ^^^^^^^^^^^^^^

src/test/ui/cdylib-deps-must-be-static.rs

@@ -1,3 +1,4 @@
+// build-fail
 // error-pattern: crate `cdylib_dep` required to be available in rlib format, but was not found
 // aux-build:cdylib-dep.rs
 // ignore-musl

src/test/ui/commandline-argfile-badutf8.rs

@@ -1,6 +1,5 @@
 // Check to see if we can get parameters from an @argsfile file
 //
-// build-fail
 // compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-badutf8.args
 
 #[cfg(not(cmdline_set))]

src/test/ui/commandline-argfile-missing.rs

@@ -1,7 +1,6 @@
 // Check to see if we can get parameters from an @argsfile file
 //
 // ignore-tidy-linelength
-// build-fail
 // normalize-stderr-test: "os error \d+" -> "os error $$ERR"
 // normalize-stderr-test: "commandline-argfile-missing.args:[^(]*" -> "commandline-argfile-missing.args: $$FILE_MISSING "
 // compile-flags: --cfg cmdline_set @{{src-base}}/commandline-argfile-missing.args

src/test/ui/consts/array-literal-index-oob.rs

@@ -1,3 +1,5 @@
+// build-fail
+
 fn main() {
     &{[1, 2, 3][4]};
     //~^ ERROR index out of bounds

src/test/ui/consts/array-literal-index-oob.stderr

@@ -1,13 +1,13 @@
 error: index out of bounds: the len is 3 but the index is 4
-  --> $DIR/array-literal-index-oob.rs:2:7
+  --> $DIR/array-literal-index-oob.rs:4:7
    |
 LL |     &{[1, 2, 3][4]};
    |       ^^^^^^^^^^^^
    |
    = note: `#[deny(const_err)]` on by default
 
 error: reaching this expression at runtime will panic or abort
-  --> $DIR/array-literal-index-oob.rs:2:7
+  --> $DIR/array-literal-index-oob.rs:4:7
    |
 LL |     &{[1, 2, 3][4]};
    |     --^^^^^^^^^^^^-

src/test/ui/consts/assoc_const_generic_impl.rs

@@ -1,3 +1,5 @@
+// build-fail
+
 #![warn(const_err)]
 
 trait ZeroSized: Sized {

src/test/ui/consts/assoc_const_generic_impl.stderr

@@ -1,19 +1,19 @@
 warning: any use of this value will cause an error
-  --> $DIR/assoc_const_generic_impl.rs:9:34
+  --> $DIR/assoc_const_generic_impl.rs:11:34
    |
 LL |     const I_AM_ZERO_SIZED: ()  = [()][std::mem::size_of::<Self>()];
    |     -----------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    |                                  |
    |                                  index out of bounds: the len is 1 but the index is 4
    |
 note: lint level defined here
-  --> $DIR/assoc_const_generic_impl.rs:1:9
+  --> $DIR/assoc_const_generic_impl.rs:3:9
    |
 LL | #![warn(const_err)]
    |         ^^^^^^^^^
 
 error: erroneous constant encountered
-  --> $DIR/assoc_const_generic_impl.rs:11:18
+  --> $DIR/assoc_const_generic_impl.rs:13:18
    |
 LL |         let () = Self::I_AM_ZERO_SIZED;
    |                  ^^^^^^^^^^^^^^^^^^^^^

src/test/ui/consts/const-err.rs

@@ -1,3 +1,4 @@
+// build-fail
 // compile-flags: -Zforce-overflow-checks=on
 
 #![allow(exceeding_bitshifts)]

src/test/ui/consts/const-err.stderr

@@ -1,25 +1,25 @@
 warning: any use of this value will cause an error
-  --> $DIR/const-err.rs:10:17
+  --> $DIR/const-err.rs:11:17
    |
 LL | const FOO: u8 = [5u8][1];
    | ----------------^^^^^^^^-
    |                 |
    |                 index out of bounds: the len is 1 but the index is 1
    |
 note: lint level defined here
-  --> $DIR/const-err.rs:4:9
+  --> $DIR/const-err.rs:5:9
    |
 LL | #![warn(const_err)]
    |         ^^^^^^^^^
 
 error[E0080]: erroneous constant used
-  --> $DIR/const-err.rs:14:16
+  --> $DIR/const-err.rs:15:16
    |
 LL |     black_box((FOO, FOO));
    |                ^^^ referenced constant has errors
 
 error[E0080]: erroneous constant used
-  --> $DIR/const-err.rs:14:21
+  --> $DIR/const-err.rs:15:21
    |
 LL |     black_box((FOO, FOO));
    |                     ^^^ referenced constant has errors

src/test/ui/consts/const-err2.rs

@@ -1,6 +1,8 @@
 // needed because negating int::MIN will behave differently between
 // optimized compilation and unoptimized compilation and thus would
 // lead to different lints being emitted
+
+// build-fail
 // compile-flags: -O
 
 #![feature(rustc_attrs)]

src/test/ui/consts/const-err2.stderr

@@ -1,35 +1,35 @@
 error: this expression will panic at runtime
-  --> $DIR/const-err2.rs:16:13
+  --> $DIR/const-err2.rs:18:13
    |
 LL |     let a = -std::i8::MIN;
    |             ^^^^^^^^^^^^^ attempt to negate with overflow
    |
 note: lint level defined here
-  --> $DIR/const-err2.rs:9:9
+  --> $DIR/const-err2.rs:11:9
    |
 LL | #![deny(const_err)]
    |         ^^^^^^^^^
 
 error: this expression will panic at runtime
-  --> $DIR/const-err2.rs:18:13
+  --> $DIR/const-err2.rs:20:13
    |
 LL |     let b = 200u8 + 200u8 + 200u8;
    |             ^^^^^^^^^^^^^ attempt to add with overflow
 
 error: this expression will panic at runtime
-  --> $DIR/const-err2.rs:20:13
+  --> $DIR/const-err2.rs:22:13
    |
 LL |     let c = 200u8 * 4;
    |             ^^^^^^^^^ attempt to multiply with overflow
 
 error: this expression will panic at runtime
-  --> $DIR/const-err2.rs:22:13
+  --> $DIR/const-err2.rs:24:13
    |
 LL |     let d = 42u8 - (42u8 + 1);
    |             ^^^^^^^^^^^^^^^^^ attempt to subtract with overflow
 
 error: index out of bounds: the len is 1 but the index is 1
-  --> $DIR/const-err2.rs:24:14
+  --> $DIR/const-err2.rs:26:14
    |
 LL |     let _e = [5u8][1];
    |              ^^^^^^^^

src/test/ui/consts/const-err3.rs

@@ -1,6 +1,8 @@
 // needed because negating int::MIN will behave differently between
 // optimized compilation and unoptimized compilation and thus would
 // lead to different lints being emitted
+
+// build-fail
 // compile-flags: -C overflow-checks=on -O
 
 #![feature(rustc_attrs)]

src/test/ui/consts/const-err3.stderr

@@ -1,35 +1,35 @@
 error: attempt to negate with overflow
-  --> $DIR/const-err3.rs:16:13
+  --> $DIR/const-err3.rs:18:13
    |
 LL |     let a = -std::i8::MIN;
    |             ^^^^^^^^^^^^^
    |
 note: lint level defined here
-  --> $DIR/const-err3.rs:9:9
+  --> $DIR/const-err3.rs:11:9
    |
 LL | #![deny(const_err)]
    |         ^^^^^^^^^
 
 error: attempt to add with overflow
-  --> $DIR/const-err3.rs:18:13
+  --> $DIR/const-err3.rs:20:13
    |
 LL |     let b = 200u8 + 200u8 + 200u8;
    |             ^^^^^^^^^^^^^
 
 error: attempt to multiply with overflow
-  --> $DIR/const-err3.rs:20:13
+  --> $DIR/const-err3.rs:22:13
    |
 LL |     let c = 200u8 * 4;
    |             ^^^^^^^^^
 
 error: attempt to subtract with overflow
-  --> $DIR/const-err3.rs:22:13
+  --> $DIR/const-err3.rs:24:13
    |
 LL |     let d = 42u8 - (42u8 + 1);
    |             ^^^^^^^^^^^^^^^^^
 
 error: index out of bounds: the len is 1 but the index is 1
-  --> $DIR/const-err3.rs:24:14
+  --> $DIR/const-err3.rs:26:14
    |
 LL |     let _e = [5u8][1];
    |              ^^^^^^^^

src/test/ui/consts/const-eval/conditional_array_execution.rs

@@ -1,3 +1,5 @@
+// build-fail
+
 #![warn(const_err)]
 
 const X: u32 = 5;

src/test/ui/consts/const-eval/conditional_array_execution.stderr

@@ -1,19 +1,19 @@
 warning: any use of this value will cause an error
-  --> $DIR/conditional_array_execution.rs:5:19
+  --> $DIR/conditional_array_execution.rs:7:19
    |
 LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize];
    | ------------------^^^^^---------------------------
    |                   |
    |                   attempt to subtract with overflow
    |
 note: lint level defined here
-  --> $DIR/conditional_array_execution.rs:1:9
+  --> $DIR/conditional_array_execution.rs:3:9
    |
 LL | #![warn(const_err)]
    |         ^^^^^^^^^
 
 error[E0080]: evaluation of constant expression failed
-  --> $DIR/conditional_array_execution.rs:9:20
+  --> $DIR/conditional_array_execution.rs:11:20
    |
 LL |     println!("{}", FOO);
    |                    ^^^ referenced constant has errors

src/test/ui/consts/const-eval/const_fn_ptr_fail2.rs

@@ -1,4 +1,6 @@
+// build-fail
 // compile-flags: -Zunleash-the-miri-inside-of-you
+
 #![feature(const_fn)]
 #![allow(const_err)]
 

src/test/ui/consts/const-eval/const_fn_ptr_fail2.stderr

@@ -1,11 +1,11 @@
 warning: skipping const checks
-  --> $DIR/const_fn_ptr_fail2.rs:9:5
+  --> $DIR/const_fn_ptr_fail2.rs:11:5
    |
 LL |     x(y)
    |     ^^^^
 
 error[E0080]: evaluation of constant expression failed
-  --> $DIR/const_fn_ptr_fail2.rs:16:5
+  --> $DIR/const_fn_ptr_fail2.rs:18:5
    |
 LL |     assert_eq!(Y, 4);
    |     ^^^^^^^^^^^-^^^^^
@@ -15,7 +15,7 @@ LL |     assert_eq!(Y, 4);
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error[E0080]: evaluation of constant expression failed
-  --> $DIR/const_fn_ptr_fail2.rs:18:5
+  --> $DIR/const_fn_ptr_fail2.rs:20:5
    |
 LL |     assert_eq!(Z, 4);
    |     ^^^^^^^^^^^-^^^^^

src/test/ui/consts/const-eval/index-out-of-bounds-never-type.rs

@@ -1,3 +1,5 @@
+// build-fail
+
 // Regression test for #66975
 #![warn(const_err)]
 #![feature(never_type)]

src/test/ui/consts/const-eval/index-out-of-bounds-never-type.stderr

@@ -1,19 +1,19 @@
 warning: any use of this value will cause an error
-  --> $DIR/index-out-of-bounds-never-type.rs:8:61
+  --> $DIR/index-out-of-bounds-never-type.rs:10:61
    |
 LL |     const VOID: ! = { let x = 0 * std::mem::size_of::<T>(); [][x] };
    |     --------------------------------------------------------^^^^^---
    |                                                             |
    |                                                             index out of bounds: the len is 0 but the index is 0
    |
 note: lint level defined here
-  --> $DIR/index-out-of-bounds-never-type.rs:2:9
+  --> $DIR/index-out-of-bounds-never-type.rs:4:9
    |
 LL | #![warn(const_err)]
    |         ^^^^^^^^^
 
 error: erroneous constant encountered
-  --> $DIR/index-out-of-bounds-never-type.rs:13:13
+  --> $DIR/index-out-of-bounds-never-type.rs:15:13
    |
 LL |     let _ = PrintName::<T>::VOID;
    |             ^^^^^^^^^^^^^^^^^^^^

src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs

@@ -1,3 +1,5 @@
+// build-fail
+
 fn main() {
     let array = [std::env::args().len()];
     array[1]; //~ ERROR index out of bounds

src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr

@@ -1,5 +1,5 @@
 error: index out of bounds: the len is 1 but the index is 1
-  --> $DIR/index_out_of_bounds_propagated.rs:3:5
+  --> $DIR/index_out_of_bounds_propagated.rs:5:5
    |
 LL |     array[1];
    |     ^^^^^^^^

src/test/ui/consts/const-eval/issue-43197.rs

@@ -1,3 +1,5 @@
+// build-fail
+
 #![warn(const_err)]
 
 const fn foo(x: u32) -> u32 {

src/test/ui/consts/const-eval/issue-43197.stderr

@@ -1,33 +1,33 @@
 warning: any use of this value will cause an error
-  --> $DIR/issue-43197.rs:8:20
+  --> $DIR/issue-43197.rs:10:20
    |
 LL |     const X: u32 = 0-1;
    |     ---------------^^^-
    |                    |
    |                    attempt to subtract with overflow
    |
 note: lint level defined here
-  --> $DIR/issue-43197.rs:1:9
+  --> $DIR/issue-43197.rs:3:9
    |
 LL | #![warn(const_err)]
    |         ^^^^^^^^^
 
 warning: any use of this value will cause an error
-  --> $DIR/issue-43197.rs:10:24
+  --> $DIR/issue-43197.rs:12:24
    |
 LL |     const Y: u32 = foo(0-1);
    |     -------------------^^^--
    |                        |
    |                        attempt to subtract with overflow
 
 error[E0080]: evaluation of constant expression failed
-  --> $DIR/issue-43197.rs:12:23
+  --> $DIR/issue-43197.rs:14:23
    |
 LL |     println!("{} {}", X, Y);
    |                       ^ referenced constant has errors
 
 error[E0080]: evaluation of constant expression failed
-  --> $DIR/issue-43197.rs:12:26
+  --> $DIR/issue-43197.rs:14:26
    |
 LL |     println!("{} {}", X, Y);
    |                          ^ referenced constant has errors

src/test/ui/consts/const-eval/issue-44578.rs

@@ -1,3 +1,5 @@
+// build-fail
+
 #![allow(const_err)]
 
 trait Foo {