fix more tests

Author: saethlin

compiler/rustc_mir_transform/src/pass_manager.rs

@@ -252,7 +252,10 @@ fn run_passes_inner<'tcx>(
 
         let validate =
             (validate_each & tcx.sess.opts.unstable_opts.validate_mir & !body.should_skip())
-                || new_phase == MirPhase::Runtime(RuntimePhase::Optimized);
+                || matches!(
+                    new_phase,
+                    MirPhase::Runtime(RuntimePhase::Optimized | RuntimePhase::Codegen)
+                );
         let lint = tcx.sess.opts.unstable_opts.lint_mir & !body.should_skip();
         if validate {
             validate_body(tcx, body, format!("after phase change to {}", new_phase.name()));

tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-abort.diff

@@ -54,8 +54,8 @@
           StorageDead(_7);
           StorageLive(_11);
           StorageLive(_8);
-          _8 = UbChecks();
-          switchInt(move _8) -> [0: bb4, otherwise: bb2];
+          _8 = const false;
+          switchInt(const false) -> [0: bb4, otherwise: bb2];
       }
 
       bb1: {

tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-unwind.diff

@@ -54,8 +54,8 @@
           StorageDead(_7);
           StorageLive(_11);
           StorageLive(_8);
-          _8 = UbChecks();
-          switchInt(move _8) -> [0: bb5, otherwise: bb3];
+          _8 = const false;
+          switchInt(const false) -> [0: bb5, otherwise: bb3];
       }
 
       bb1: {

tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-abort.diff

@@ -54,8 +54,8 @@
           StorageDead(_7);
           StorageLive(_11);
           StorageLive(_8);
-          _8 = UbChecks();
-          switchInt(move _8) -> [0: bb4, otherwise: bb2];
+          _8 = const false;
+          switchInt(const false) -> [0: bb4, otherwise: bb2];
       }
 
       bb1: {

tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-unwind.diff

@@ -54,8 +54,8 @@
           StorageDead(_7);
           StorageLive(_11);
           StorageLive(_8);
-          _8 = UbChecks();
-          switchInt(move _8) -> [0: bb5, otherwise: bb3];
+          _8 = const false;
+          switchInt(const false) -> [0: bb5, otherwise: bb3];
       }
 
       bb1: {

tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-abort.diff

@@ -56,8 +56,10 @@
           StorageDead(_7);
           StorageLive(_11);
           StorageLive(_8);
-          _8 = UbChecks();
-          switchInt(move _8) -> [0: bb4, otherwise: bb2];
+-         _8 = UbChecks();
+-         switchInt(move _8) -> [0: bb4, otherwise: bb2];
++         _8 = const false;
++         switchInt(const false) -> [0: bb4, otherwise: bb2];
       }
 
       bb1: {

tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-unwind.diff

@@ -56,8 +56,10 @@
           StorageDead(_7);
           StorageLive(_11);
           StorageLive(_8);
-          _8 = UbChecks();
-          switchInt(move _8) -> [0: bb5, otherwise: bb3];
+-         _8 = UbChecks();
+-         switchInt(move _8) -> [0: bb5, otherwise: bb3];
++         _8 = const false;
++         switchInt(const false) -> [0: bb5, otherwise: bb3];
       }
 
       bb1: {

tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-abort.diff

@@ -56,8 +56,10 @@
           StorageDead(_7);
           StorageLive(_11);
           StorageLive(_8);
-          _8 = UbChecks();
-          switchInt(move _8) -> [0: bb4, otherwise: bb2];
+-         _8 = UbChecks();
+-         switchInt(move _8) -> [0: bb4, otherwise: bb2];
++         _8 = const false;
++         switchInt(const false) -> [0: bb4, otherwise: bb2];
       }
 
       bb1: {

tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-unwind.diff

@@ -56,8 +56,10 @@
           StorageDead(_7);
           StorageLive(_11);
           StorageLive(_8);
-          _8 = UbChecks();
-          switchInt(move _8) -> [0: bb5, otherwise: bb3];
+-         _8 = UbChecks();
+-         switchInt(move _8) -> [0: bb5, otherwise: bb3];
++         _8 = const false;
++         switchInt(const false) -> [0: bb5, otherwise: bb3];
       }
 
       bb1: {

tests/ui/mir/validate/critical-edge.rs

@@ -10,7 +10,7 @@
 use std::intrinsics::mir::*;
 
 #[custom_mir(dialect = "runtime", phase = "codegen")]
-#[inline]
+#[inline(never)] // Force codegen so we go through codegen MIR validation
 pub fn f(a: u32) -> u32 {
     mir! {
         {
@@ -29,5 +29,3 @@ pub fn f(a: u32) -> u32 {
         }
     }
 }
-
-pub static F: fn(u32) -> u32 = f;

tests/ui/polymorphization/issue-74614.stderr

@@ -0,0 +1,4 @@
+ WARN rustc_codegen_ssa::mir::locals Unexpected initial operand type:
+ expected Closure(DefId(0:9 ~ issue_74614[b919]::outer::{closure#0}), [Closure(DefId(0:9 ~ issue_74614[b919]::outer::{closure#0}), [T/#0, i8, Binder { value: extern "RustCall" fn(()), bound_vars: [] }, ()]), i8, Binder { value: extern "RustCall" fn(()), bound_vars: [] }, ()]),
+ found    Closure(DefId(0:9 ~ issue_74614[b919]::outer::{closure#0}), [T/#0, i8, Binder { value: extern "RustCall" fn(()), bound_vars: [] }, ()]).
+ See <https://github.com/rust-lang/rust/issues/114858>.

tests/ui/polymorphization/issue-74636.stderr

@@ -0,0 +1,4 @@
+ WARN rustc_codegen_ssa::mir::locals Unexpected initial operand type:
+ expected Closure(DefId(0:8 ~ issue_74636[7d87]::outer::{closure#0}), [Closure(DefId(0:8 ~ issue_74636[7d87]::outer::{closure#0}), [T/#0, i8, Binder { value: extern "RustCall" fn(()), bound_vars: [] }, ()]), i8, Binder { value: extern "RustCall" fn(()), bound_vars: [] }, ()]),
+ found    Closure(DefId(0:8 ~ issue_74636[7d87]::outer::{closure#0}), [T/#0, i8, Binder { value: extern "RustCall" fn(()), bound_vars: [] }, ()]).
+ See <https://github.com/rust-lang/rust/issues/114858>.