Skip to content

SILCombine: don't fold unchecked_take_enum_data_addr - destroy_addr of enums with deinit #84860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2025
Merged

SILCombine: don't fold unchecked_take_enum_data_addr - destroy_addr of enums with deinit #84860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,6 +1146,10 @@ SILInstruction *SILCombiner::visitUncheckedTakeEnumDataAddrInst(
}

if (onlyDestroys) {
// Destroying whole non-copyable enums with a deinit would wrongly trigger calling its deinit.
if (tedai->getOperand()->getType().isValueTypeWithDeinit())
return nullptr;

// The unchecked_take_enum_data_addr is dead: remove it and replace all
// destroys with a destroy of its operand.
while (!tedai->use_empty()) {
Expand Down
26 changes: 26 additions & 0 deletions test/SILOptimizer/sil_combine_moveonly.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,3 +185,29 @@ bb0(%0 : @owned $S2):
return %r
}

// CHECK-LABEL: sil [ossa] @dont_fold_destroy_of_take_enum_with_deinit_ossa :
// CHECK: bb0(%0 : $*MaybeFileDescriptor):
// CHECK-NEXT: %1 = unchecked_take_enum_data_addr %0
// CHECK-NEXT: destroy_addr %1
// CHECK: } // end sil function 'dont_fold_destroy_of_take_enum_with_deinit_ossa'
sil [ossa] @dont_fold_destroy_of_take_enum_with_deinit_ossa : $@convention(thin) (@in MaybeFileDescriptor) -> () {
bb0(%0 : $*MaybeFileDescriptor):
%1 = unchecked_take_enum_data_addr %0, #MaybeFileDescriptor.some!enumelt
destroy_addr %1
%r = tuple ()
return %r : $()
}

// CHECK-LABEL: sil @dont_fold_destroy_of_take_enum_with_deinit :
// CHECK: bb0(%0 : $*MaybeFileDescriptor):
// CHECK-NEXT: %1 = unchecked_take_enum_data_addr %0
// CHECK-NEXT: destroy_addr %1
// CHECK: } // end sil function 'dont_fold_destroy_of_take_enum_with_deinit'
sil @dont_fold_destroy_of_take_enum_with_deinit : $@convention(thin) (@in MaybeFileDescriptor) -> () {
bb0(%0 : $*MaybeFileDescriptor):
%1 = unchecked_take_enum_data_addr %0, #MaybeFileDescriptor.some!enumelt
destroy_addr %1
%r = tuple ()
return %r : $()
}