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

[CS] Remove resolveInterfaceType

Browse Source 
Use `simplifyType` instead with the new parameter
for getting an interface type. Also avoid using
`resolveInterfaceType` in CSApply since we don't
need the opened generic parameter mapping behavior.
This commit is contained in:
Hamish Knight
2024-12-31 18:39:20 +00:00
parent 9fe4abc6fd
commit 9fb064ad2c
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Sema/ConstraintSystem.cpp
View File

@@ -4022,10 +4022,6 @@ ASTNode ConstraintSystem::includingParentApply(ASTNode node) {
return node;
}
Type Solution::resolveInterfaceType(Type type) const {
return simplifyType(type, /*wantInterfaceType*/ true);
}
std::optional<FunctionArgApplyInfo>
Solution::getFunctionArgApplyInfo(ConstraintLocator *locator) const {
// It's only valid to use `&` in argument positions, but we need
@@ -4118,13 +4114,12 @@ Solution::getFunctionArgApplyInfo(ConstraintLocator *locator) const {
auto *callee = choice ? choice->getDeclOrNull() : nullptr;
if (callee && callee->hasInterfaceType()) {
// If we have a callee with an interface type, we can use it. This is
// preferable to resolveInterfaceType, as this will allow us to get a
// GenericFunctionType for generic decls.
// preferable to simplifyType for the function, as this will allow us to get
// a GenericFunctionType for generic decls.
//
// Note that it's possible to find a callee without an interface type. This
// can happen for example with closure parameters, where the interface type
// isn't set until the solution is applied. In that case, use
// resolveInterfaceType.
// isn't set until the solution is applied. In that case, use simplifyType.
fnInterfaceType = callee->getInterfaceType();
// Strip off the curried self parameter if necessary.
@@ -4145,7 +4140,7 @@ Solution::getFunctionArgApplyInfo(ConstraintLocator *locator) const {
}
#endif
} else {
fnInterfaceType = resolveInterfaceType(rawFnType);
fnInterfaceType = simplifyType(rawFnType, /*wantInterfaceType*/ true);
}
auto argIdx = applyArgElt->getArgIdx();