Make validate_mir pull optimized/ctfe MIR for all bodies

matthiaskrgr · Aug 3, 2024 · 470ada2 · 470ada2
1 parent a604303
commit 470ada2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs
@@ -818,6 +818,13 @@ fn run_required_analyses(tcx: TyCtxt<'_>) {
  });
  sess.time("layout_testing", || layout_test::test_layout(tcx));
  sess.time("abi_testing", || abi_test::test_abi(tcx));
+ if tcx.sess.opts.unstable_opts.validate_mir {
+ sess.time("ensuring_optimized_MIR_is_computable", || {
+ tcx.hir().par_body_owners(|def_id| {
+ tcx.instance_mir(ty::InstanceKind::Item(def_id.into()));
+ });
+ });
+ }
 }
 
 /// Runs the type-checking, region checking and other miscellaneous analysis

diff --git a/tests/crashes/121127.rs b/tests/crashes/121127.rs
@@ -1,5 +1,5 @@
 //@ known-bug: #121127
-//@ compile-flags: -Zpolymorphize=on -Zinline-mir=yes -C debuginfo=2
+//@ compile-flags: -Zvalidate-mir -Zinline-mir=yes -C debuginfo=2
 // Note that as of PR#123949 this only crashes with debuginfo enabled
 
 #![feature(specialization)]

diff --git a/tests/crashes/122909.rs b/tests/crashes/122909.rs
@@ -1,4 +1,4 @@
-//@ compile-flags: -Zpolymorphize=on -Zinline-mir=yes
+//@ compile-flags: -Zvalidate-mir -Zinline-mir=yes
 //@ known-bug: #122909
 
 

diff --git a/tests/crashes/126896.rs b/tests/crashes/126896.rs
@@ -1,5 +1,5 @@
 //@ known-bug: rust-lang/rust#126896
-//@ compile-flags: -Zpolymorphize=on -Zinline-mir=yes
+//@ compile-flags: -Zvalidate-mir -Zinline-mir=yes
 
 #![feature(type_alias_impl_trait)]
 type Two<'a, 'b> = impl std::fmt::Debug;