bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert "Move CtfeLimit to mir_const's set of passes"

Browse source 
This reverts commit 332542a92223b2800ed372d2d461921147f29477.
This commit is contained in:
Bryan Garza 2022-12-30 01:55:16 +00:00
parent 172662dede
commit d3c13a0102
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_borrowck/src/lib.rs
View file

@ -610,7 +610,6 @@ impl<'cx, 'tcx> rustc_mir_dataflow::ResultsVisitor<'cx, 'tcx> for MirBorrowckCtx
// Doesn't have any language semantics // Doesn't have any language semantics
| StatementKind::Coverage(..) | StatementKind::Coverage(..)
// Does not actually affect borrowck // Does not actually affect borrowck
| StatementKind::ConstEvalCounter
| StatementKind::StorageLive(..) => {} | StatementKind::StorageLive(..) => {}
StatementKind::StorageDead(local) => { StatementKind::StorageDead(local) => {
self.access_place( self.access_place(
@ -621,7 +620,8 @@ impl<'cx, 'tcx> rustc_mir_dataflow::ResultsVisitor<'cx, 'tcx> for MirBorrowckCtx
flow_state, flow_state,
); );
} }
StatementKind::Nop StatementKind::ConstEvalCounter
| StatementKind::Nop
| StatementKind::Retag { .. } | StatementKind::Retag { .. }
| StatementKind::Deinit(..) | StatementKind::Deinit(..)
| StatementKind::SetDiscriminant { .. } => { | StatementKind::SetDiscriminant { .. } => {

2
compiler/rustc_mir_transform/src/lib.rs
View file

@ -299,7 +299,6 @@ fn mir_const(tcx: TyCtxt<'_>, def: ty::WithOptConstParam<LocalDefId>) -> &Steal<
// What we need to do constant evaluation. // What we need to do constant evaluation.
&simplify::SimplifyCfg::new("initial"), &simplify::SimplifyCfg::new("initial"),
&rustc_peek::SanityCheck, // Just a lint &rustc_peek::SanityCheck, // Just a lint
&ctfe_limit::CtfeLimit,
], ],
None, None,
); );
@ -519,6 +518,7 @@ fn run_runtime_lowering_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
// CTFE support for aggregates. // CTFE support for aggregates.
&deaggregator::Deaggregator, &deaggregator::Deaggregator,
&Lint(const_prop_lint::ConstProp), &Lint(const_prop_lint::ConstProp),
&ctfe_limit::CtfeLimit,
]; ];
pm::run_passes_no_validate(tcx, body, passes, Some(MirPhase::Runtime(RuntimePhase::Initial))); pm::run_passes_no_validate(tcx, body, passes, Some(MirPhase::Runtime(RuntimePhase::Initial)));
} }