adjust tests to reality

Author: RalfJung

tests/ui/consts/required-consts/dead-code-in-dead-drop.no-opt.stderr renamed to tests/ui/consts/required-consts/dead-code-in-dead-drop.noopt.stderr

@@ -1,8 +1,8 @@
 error[E0080]: evaluation of `Fail::<i32>::C` failed
-  --> $DIR/dead-code-in-dead-drop.rs:9:19
+  --> $DIR/dead-code-in-dead-drop.rs:12:19
    |
 LL |     const C: () = panic!();
-   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/dead-code-in-dead-drop.rs:9:19
+   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/dead-code-in-dead-drop.rs:12:19
    |
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 

tests/ui/consts/required-consts/dead-code-in-dead-drop.rs

@@ -1,12 +1,15 @@
-//@revisions: opt no-opt
-//@ build-fail
+//@revisions: noopt opt
+//@[noopt] build-fail
 //@[opt] compile-flags: -O
+//FIXME: `opt` revision currently does not stop with an error due to
+//<https://github.com/rust-lang/rust/issues/107503>.
+//@[opt] build-pass
 //! Make sure we detect erroneous constants post-monomorphization even when they are unused. This is
 //! crucial, people rely on it for soundness. (https://github.com/rust-lang/rust/issues/112090)
 
 struct Fail<T>(T);
 impl<T> Fail<T> {
-    const C: () = panic!(); //~ERROR evaluation of `Fail::<i32>::C` failed
+    const C: () = panic!(); //[noopt]~ERROR evaluation of `Fail::<i32>::C` failed
 }
 
 // This function is not actually called, but is mentioned implicitly as destructor in dead code in a

tests/ui/consts/required-consts/dead-code-in-dead-vtable.no-opt.stderr

@@ -7,7 +7,7 @@ LL |     const C: () = panic!();
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: the above error was encountered while instantiating `fn <std::vec::Vec<i32> as MyTrait>::not_called`
-  --> $DIR/dead-code-in-dead-vtable.rs:30:40
+  --> $DIR/dead-code-in-dead-vtable.rs:32:40
    |
 LL |         let gen_vtable: &dyn MyTrait = &v; // vtable "appears" here
    |                                        ^^

tests/ui/consts/required-consts/dead-code-in-dead-drop.opt.stderr renamed to tests/ui/consts/required-consts/dead-code-in-dead-vtable.noopt.stderr

@@ -1,13 +1,16 @@
 error[E0080]: evaluation of `Fail::<i32>::C` failed
-  --> $DIR/dead-code-in-dead-drop.rs:9:19
+  --> $DIR/dead-code-in-dead-vtable.rs:12:19
    |
 LL |     const C: () = panic!();
-   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/dead-code-in-dead-drop.rs:9:19
+   |                   ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/dead-code-in-dead-vtable.rs:12:19
    |
    = note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-note: the above error was encountered while instantiating `fn <Fail<i32> as std::ops::Drop>::drop`
-  --> $SRC_DIR/core/src/ptr/mod.rs:LL:COL
+note: the above error was encountered while instantiating `fn <std::vec::Vec<i32> as MyTrait>::not_called`
+  --> $DIR/dead-code-in-dead-vtable.rs:35:40
+   |
+LL |         let gen_vtable: &dyn MyTrait = &v; // vtable "appears" here
+   |                                        ^^
 
 error: aborting due to 1 previous error
 

tests/ui/consts/required-consts/dead-code-in-dead-vtable.rs

@@ -1,12 +1,15 @@
-//@revisions: opt no-opt
-//@ build-fail
+//@revisions: noopt opt
+//@[noopt] build-fail
 //@[opt] compile-flags: -O
+//FIXME: `opt` revision currently does not stop with an error due to
+//<https://github.com/rust-lang/rust/issues/107503>.
+//@[opt] build-pass
 //! Make sure we detect erroneous constants post-monomorphization even when they are unused. This is
 //! crucial, people rely on it for soundness. (https://github.com/rust-lang/rust/issues/112090)
 
 struct Fail<T>(T);
 impl<T> Fail<T> {
-    const C: () = panic!(); //~ERROR evaluation of `Fail::<i32>::C` failed
+    const C: () = panic!(); //[noopt]~ERROR evaluation of `Fail::<i32>::C` failed
 }
 
 trait MyTrait {