Skip to content

[6.2.1] SILCombine: fix convert_function -> apply peephole for generic function types #83966

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
Sep 4, 2025
Merged

[6.2.1] SILCombine: fix convert_function -> apply peephole for generic function types #83966

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
12 changes: 12 additions & 0 deletions lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,18 @@ SILCombiner::optimizeApplyOfConvertFunctionInst(FullApplySite AI,
auto oldOpParamTypes = substConventions.getParameterSILTypes(context);
auto newOpParamTypes = convertConventions.getParameterSILTypes(context);

// Currently we cannot deal with generic arguments/returns. Bail in this case.
for (auto newRetTy : newOpRetTypes) {
if (newRetTy.hasTypeParameter())
return nullptr;
}
for (auto newParamTy : newOpParamTypes) {
if (newParamTy.hasTypeParameter())
return nullptr;
}
if (newIndirectErrorResultType && newIndirectErrorResultType.hasTypeParameter())
return nullptr;

llvm::SmallVector<SILValue, 8> Args;
llvm::SmallVector<BeginBorrowInst *, 8> Borrows;
auto convertOp = [&](SILValue Op, SILType OldOpType, SILType NewOpType,
Expand Down
18 changes: 18 additions & 0 deletions test/SILOptimizer/sil_combine_apply.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,24 @@ bb0:
return %return : $()
}

class GenC<T> {
}

sil @takeGenC : $@convention(thin) <τ_0_0> (@owned GenC<τ_0_0>) -> ()

// CHECK-LABEL: sil [ossa] @convert_function_with_generic_arg :
// CHECK: [[C:%.*]] = convert_function
// CHECK: apply [[C]]
// CHECK: } // end sil function 'convert_function_with_generic_arg'
sil [ossa] @convert_function_with_generic_arg : $@convention(thin) (@owned AnyObject) -> () {
bb0(%0 : @owned $AnyObject):
%2 = function_ref @takeGenC : $@convention(thin) <τ_0_0> (@owned GenC<τ_0_0>) -> ()
%9 = convert_function %2 to $@convention(thin) (@owned AnyObject) -> ()
%30 = apply %9(%0) : $@convention(thin) (@owned AnyObject) -> ()
%r = tuple ()
return %r
}

sil shared [transparent] [thunk] @genericClosure : $@convention(thin) <T> (@in T) -> @out T {
bb0(%0 : $*T, %1 : $*T):
%12 = tuple ()
Expand Down