Move CtfeLimit MirPass to inner_mir_for_ctfe

bryangarza · bryangarza · commit 999d19d8aa39 · 2023-01-23T23:56:22.000Z
diff --git a/compiler/rustc_mir_transform/src/lib.rs b/compiler/rustc_mir_transform/src/lib.rs
@@ -411,6 +411,8 @@ fn inner_mir_for_ctfe(tcx: TyCtxt<'_>, def: ty::WithOptConstParam<LocalDefId>) -
         }
     }
 
+    pm::run_passes(tcx, &mut body, &[&ctfe_limit::CtfeLimit], None);
+
     debug_assert!(!body.has_free_regions(), "Free regions in MIR for CTFE");
 
     body
@@ -518,7 +520,6 @@ fn run_runtime_lowering_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
         // CTFE support for aggregates.
         &deaggregator::Deaggregator,
         &Lint(const_prop_lint::ConstProp),
-        &ctfe_limit::CtfeLimit,
     ];
     pm::run_passes_no_validate(tcx, body, passes, Some(MirPhase::Runtime(RuntimePhase::Initial)));
 }

Original file line number	Diff line number	Diff line change
`@@ -411,6 +411,8 @@ fn inner_mir_for_ctfe(tcx: TyCtxt<'_>, def: ty::WithOptConstParam<LocalDefId>) -`
`411`	`411`	`}`
`412`	`412`	`}`
`413`	`413`
	`414`	`+ pm::run_passes(tcx, &mut body, &[&ctfe_limit::CtfeLimit], None);`
	`415`	`+`
`414`	`416`	`debug_assert!(!body.has_free_regions(), "Free regions in MIR for CTFE");`
`415`	`417`
`416`	`418`	`body`
`@@ -518,7 +520,6 @@ fn run_runtime_lowering_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {`
`518`	`520`	`// CTFE support for aggregates.`
`519`	`521`	`&deaggregator::Deaggregator,`
`520`	`522`	`&Lint(const_prop_lint::ConstProp),`
`521`		`- &ctfe_limit::CtfeLimit,`
`522`	`523`	`];`
`523`	`524`	`pm::run_passes_no_validate(tcx, body, passes, Some(MirPhase::Runtime(RuntimePhase::Initial)));`
`524`	`525`	`}`