Re-enable the early otherwise branch optimization

dianqk · dianqk · commit a334848ba329 · 2024-04-07T21:14:29.000+08:00
diff --git a/compiler/rustc_mir_transform/src/early_otherwise_branch.rs b/compiler/rustc_mir_transform/src/early_otherwise_branch.rs
@@ -92,8 +92,7 @@ pub struct EarlyOtherwiseBranch;
 
 impl<'tcx> MirPass<'tcx> for EarlyOtherwiseBranch {
     fn is_enabled(&self, sess: &rustc_session::Session) -> bool {
-        // unsound: https://github.com/rust-lang/rust/issues/95162
-        sess.mir_opt_level() >= 3 && sess.opts.unstable_opts.unsound_mir_opts
+        sess.mir_opt_level() >= 2
     }
 
     fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,7 @@ pub struct EarlyOtherwiseBranch;`
`92`	`92`
`93`	`93`	`impl<'tcx> MirPass<'tcx> for EarlyOtherwiseBranch {`
`94`	`94`	`fn is_enabled(&self, sess: &rustc_session::Session) -> bool {`
`95`		`- // unsound: https://github.com/rust-lang/rust/issues/95162`
`96`		`- sess.mir_opt_level() >= 3 && sess.opts.unstable_opts.unsound_mir_opts`
	`95`	`+ sess.mir_opt_level() >= 2`
`97`	`96`	`}`
`98`	`97`
`99`	`98`	`fn run_pass(&self, tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {`