diff options
| author | bors <bors@rust-lang.org> | 2023-10-11 19:02:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-11 19:02:49 +0000 |
| commit | 475c71da0710fd1d40c046f9cee04b733b5b2b51 (patch) | |
| tree | 9728651e89c32ac9554b665ff351fdb552c68524 /compiler/rustc_mir_transform/src/lib.rs | |
| parent | c1691db366c0f2e2341c60377c248ca2d9335076 (diff) | |
| parent | 8374805d67d9dfd1f3f33d7ccfd8bb11a7c6446d (diff) | |
| download | rust-475c71da0710fd1d40c046f9cee04b733b5b2b51.tar.gz rust-475c71da0710fd1d40c046f9cee04b733b5b2b51.zip | |
Auto merge of #116640 - matthiaskrgr:rollup-xt9r5ir, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #116219 (Relate alias ty with variance) - #116315 (Do not check for impossible predicates in const-prop lint.) - #116436 (Structurally normalize for closure) - #116597 (Prevent showing methods from blanket impls of not available foreign traits to show up in the search results) - #116627 (small cleanup) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src/lib.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/lib.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_mir_transform/src/lib.rs b/compiler/rustc_mir_transform/src/lib.rs index c42888d8791..9ee2f6dcea0 100644 --- a/compiler/rustc_mir_transform/src/lib.rs +++ b/compiler/rustc_mir_transform/src/lib.rs @@ -496,7 +496,7 @@ fn run_runtime_lowering_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) { &elaborate_box_derefs::ElaborateBoxDerefs, &generator::StateTransform, &add_retag::AddRetag, - &Lint(const_prop_lint::ConstProp), + &Lint(const_prop_lint::ConstPropLint), ]; pm::run_passes_no_validate(tcx, body, passes, Some(MirPhase::Runtime(RuntimePhase::Initial))); } @@ -554,8 +554,6 @@ fn run_optimization_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) { &const_prop::ConstProp, &gvn::GVN, &dataflow_const_prop::DataflowConstProp, - // - // Const-prop runs unconditionally, but doesn't mutate the MIR at mir-opt-level=0. &const_debuginfo::ConstDebugInfo, &o1(simplify_branches::SimplifyConstCondition::AfterConstProp), &early_otherwise_branch::EarlyOtherwiseBranch, |