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

[CS] Replace UnresolvedType with ErrorType in simplifyType/resolveType

Browse Source 
This means we now either produce a bare ErrorType, or an ErrorType
with a generic parameter original type for a generic parameter hole.
We ought to further consolidate this logic by sinking the generic
parameter original type replacement into `simplifyType` itself, but
I'm leaving that for a future patch since it affects completion
results and I want to try keep this close to NFC.
This commit is contained in:
Hamish Knight
2025-10-01 22:30:46 +01:00
parent 21141f466c
commit 5171b84dba
11 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Sema/ConstraintSystem.cpp
View File

@@ -1886,7 +1886,7 @@ Type Solution::simplifyType(Type type, bool wantInterfaceType) const {
ASSERT(!(wantInterfaceType && resolvedType->hasPrimaryArchetype()));
// We may have type variables and placeholders left over. These are solver
// allocated so cannot escape this function. Turn them into UnresolvedType.
// allocated so cannot escape this function. Turn them into ErrorType.
// - Type variables may still be present from unresolved pack expansions where
// e.g the count type is a hole, so the pattern may never become a
// concrete type.
@@ -1900,7 +1900,7 @@ Type Solution::simplifyType(Type type, bool wantInterfaceType) const {
auto *typePtr = type.getPointer();
if (isa<TypeVariableType>(typePtr) || isa<PlaceholderType>(typePtr))
return Type(ctx.TheUnresolvedType);
return ErrorType::get(ctx);
return std::nullopt;
});
@@ -4298,7 +4298,7 @@ Solution::getFunctionArgApplyInfo(ConstraintLocator *locator) const {
// If callee couldn't be resolved due to expression
// issues e.g. it's a reference to an invalid member
// let's just return here.
if (simplifyType(rawFnType)->is<UnresolvedType>())
if (simplifyType(rawFnType)->is<ErrorType>())
return std::nullopt;
// A tuple construction is spelled in the AST as a function call, but