Skip to content

Commit 7e47022

Browse files
Disable drop elaboration optimization for inactive variants
1 parent 034975a commit 7e47022

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/librustc_mir/transform/elaborate_drops.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ impl<'tcx> MirPass<'tcx> for ElaborateDrops {
4242
let dead_unwinds = find_dead_unwinds(tcx, body, def_id, &env);
4343

4444
let inits = MaybeInitializedPlaces::new(tcx, body, &env)
45-
.mark_inactive_variants_as_uninit(true)
45+
.mark_inactive_variants_as_uninit(false)
4646
.into_engine(tcx, body, def_id)
4747
.dead_unwinds(&dead_unwinds)
4848
.iterate_to_fixpoint()
4949
.into_results_cursor(body);
5050

5151
let uninits = MaybeUninitializedPlaces::new(tcx, body, &env)
52-
.mark_inactive_variants_as_uninit(true)
52+
.mark_inactive_variants_as_uninit(false)
5353
.into_engine(tcx, body, def_id)
5454
.dead_unwinds(&dead_unwinds)
5555
.iterate_to_fixpoint()
@@ -83,7 +83,7 @@ fn find_dead_unwinds<'tcx>(
8383
// reach cleanup blocks, which can't have unwind edges themselves.
8484
let mut dead_unwinds = BitSet::new_empty(body.basic_blocks().len());
8585
let mut flow_inits = MaybeInitializedPlaces::new(tcx, body, &env)
86-
.mark_inactive_variants_as_uninit(true)
86+
.mark_inactive_variants_as_uninit(false)
8787
.into_engine(tcx, body, def_id)
8888
.iterate_to_fixpoint()
8989
.into_results_cursor(body);

0 commit comments

Comments
 (0)