Skip to content

Commit 1deaa69

Browse files
authored
Rollup merge of rust-lang#107256 - JakobDegen:delete-sai, r=cjgillot
Delete `SimplifyArmIdentity` and `SimplifyBranchSame` mir opts I had attempted to fix the first of these opts in rust-lang#94177 . However, despite that PR already being a full re-write, it still did not fix some of the core soundness issues. The optimizations that are attempted here are likely to be desirable, but I do not expect any of the currently written code to survive into a sound implementation. Deleting the code keeps us from having to maintain the passes in the meantime. Closes rust-lang#77359 , closes rust-lang#72800 , closes rust-lang#78628 r? `@cjgillot`
2 parents bd2b2ca + ad73936 commit 1deaa69

6 files changed

+0
-1041
lines changed

compiler/rustc_mir_transform/src/lib.rs

-3
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ mod shim;
9090
pub mod simplify;
9191
mod simplify_branches;
9292
mod simplify_comparison_integral;
93-
mod simplify_try;
9493
mod sroa;
9594
mod uninhabited_enum_branching;
9695
mod unreachable_prop;
@@ -567,8 +566,6 @@ fn run_optimization_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
567566
&o1(simplify_branches::SimplifyConstCondition::new("after-const-prop")),
568567
&early_otherwise_branch::EarlyOtherwiseBranch,
569568
&simplify_comparison_integral::SimplifyComparisonIntegral,
570-
&simplify_try::SimplifyArmIdentity,
571-
&simplify_try::SimplifyBranchSame,
572569
&dead_store_elimination::DeadStoreElimination,
573570
&dest_prop::DestinationPropagation,
574571
&o1(simplify_branches::SimplifyConstCondition::new("final")),

0 commit comments

Comments
 (0)