Skip to content

[6.2] Fix SILCombine of inject_enum_addr when the enum is non-trivial but payload is trivial #82980

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
Jul 11, 2025
Merged

[6.2] Fix SILCombine of inject_enum_addr when the enum is non-trivial but payload is trivial #82980

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
2 changes: 1 addition & 1 deletion lib/SILOptimizer/SILCombiner/SILCombinerMiscVisitors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@ SILCombiner::visitInjectEnumAddrInst(InjectEnumAddrInst *IEAI) {
Builder.getBuilderContext(), /*noUndef*/ true);
} else {
auto loadQual = !func->hasOwnership() ? LoadOwnershipQualifier::Unqualified
: DataAddrInst->getOperand()->getType().isTrivial(*func)
: DataAddrInst->getType().isTrivial(*func)
? LoadOwnershipQualifier::Trivial
: LoadOwnershipQualifier::Take;
enumValue =
Expand Down
22 changes: 22 additions & 0 deletions test/SILOptimizer/sil_combine_ossa.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5508,3 +5508,25 @@ bb0(%1 : @owned $Cr):
return %49
}

enum NT {
case inline(InlineArray<1, Int>)
case klass(Klass)
}

sil @get_inlinearray : $@convention(thin) () -> @out InlineArray<1, Int>

// CHECK-LABEL: sil shared [ossa] @testTrivialPayloadInNonTrivialEnum :
// CHECK-NOT: inject_enum_addr
// CHECK-LABEL: } // end sil function 'testTrivialPayloadInNonTrivialEnum'
sil shared [ossa] @testTrivialPayloadInNonTrivialEnum : $@convention(thin) () -> @owned NT {
bb0:
%0 = alloc_stack $NT
%1 = init_enum_data_addr %0, #NT.inline!enumelt
%3 = function_ref @get_inlinearray : $@convention(thin) () -> @out InlineArray<1, Int>
%4 = apply %3(%1) : $@convention(thin) () -> @out InlineArray<1, Int>
inject_enum_addr %0, #NT.inline!enumelt
%6 = load [take] %0
dealloc_stack %0
return %6
}