averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #84860 from eeckstein/fix-silcombine

Browse Source 
SILCombine: don't fold `unchecked_take_enum_data_addr` - `destroy_addr` of enums with deinit
This commit is contained in:
eeckstein
2025-10-14 00:42:26 +02:00
committed by GitHub
parent 41903b5bef 66e718525b
commit d8577e50f5
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp
View File

@@ -1146,6 +1146,10 @@ SILInstruction *SILCombiner::visitUncheckedTakeEnumDataAddrInst(
} }
if (onlyDestroys) { 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 // The unchecked_take_enum_data_addr is dead: remove it and replace all
// destroys with a destroy of its operand. // destroys with a destroy of its operand.
while (!tedai->use_empty()) { while (!tedai->use_empty()) {

26
test/SILOptimizer/sil_combine_moveonly.sil
View File

@@ -185,3 +185,29 @@ bb0(%0 : @owned $S2):
return %r 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 : $()
}