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

AST: Remove generic signature and conditional requirements from BuiltinProtocolConformance

Browse Source
This commit is contained in:
Slava Pestov
2023-08-09 16:34:51 -04:00
parent 9f51ea1de6
commit f219274e9b
9 changed files with 30 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/AST/Module.cpp
View File

@@ -1588,7 +1588,7 @@ ModuleDecl::lookupExistentialConformance(Type type, ProtocolDecl *protocol) {
// All existentials are Copyable.
if (protocol->isSpecificProtocol(KnownProtocolKind::Copyable)) {
return ProtocolConformanceRef(
ctx.getBuiltinConformance(type, protocol, GenericSignature(), {},
ctx.getBuiltinConformance(type, protocol,
BuiltinConformanceKind::Synthesized));
}
@@ -1670,8 +1670,7 @@ ProtocolConformanceRef ProtocolConformanceRef::forMissingOrInvalid(
if (shouldCreateMissingConformances(type, proto)) {
return ProtocolConformanceRef(
ctx.getBuiltinConformance(
type, proto, GenericSignature(), { },
BuiltinConformanceKind::Missing));
type, proto, BuiltinConformanceKind::Missing));
}
return ProtocolConformanceRef::forInvalid();
@@ -1774,7 +1773,7 @@ static ProtocolConformanceRef getBuiltinFunctionTypeConformance(
if (protocol->isSpecificProtocol(KnownProtocolKind::Sendable) &&
isSendableFunctionType(functionType)) {
return ProtocolConformanceRef(
ctx.getBuiltinConformance(type, protocol, GenericSignature(), { },
ctx.getBuiltinConformance(type, protocol,
BuiltinConformanceKind::Synthesized));
}
@@ -1782,7 +1781,7 @@ static ProtocolConformanceRef getBuiltinFunctionTypeConformance(
// that they capture, so it's safe to copy functions, like classes.
if (protocol->isSpecificProtocol(KnownProtocolKind::Copyable)) {
return ProtocolConformanceRef(
ctx.getBuiltinConformance(type, protocol, GenericSignature(), {},
ctx.getBuiltinConformance(type, protocol,
BuiltinConformanceKind::Synthesized));
}
@@ -1799,14 +1798,14 @@ static ProtocolConformanceRef getBuiltinMetaTypeTypeConformance(
if (protocol->isSpecificProtocol(KnownProtocolKind::Copyable) &&
!metatypeType->getInstanceType()->isPureMoveOnly()) {
return ProtocolConformanceRef(
ctx.getBuiltinConformance(type, protocol, GenericSignature(), { },
ctx.getBuiltinConformance(type, protocol,
BuiltinConformanceKind::Synthesized));
}
// All metatypes are Sendable
if (protocol->isSpecificProtocol(KnownProtocolKind::Sendable)) {
return ProtocolConformanceRef(
ctx.getBuiltinConformance(type, protocol, GenericSignature(), { },
ctx.getBuiltinConformance(type, protocol,
BuiltinConformanceKind::Synthesized));
}
@@ -1822,7 +1821,7 @@ static ProtocolConformanceRef getBuiltinBuiltinTypeConformance(
protocol->isSpecificProtocol(KnownProtocolKind::Copyable)) {
ASTContext &ctx = protocol->getASTContext();
return ProtocolConformanceRef(
ctx.getBuiltinConformance(type, protocol, GenericSignature(), { },
ctx.getBuiltinConformance(type, protocol,
BuiltinConformanceKind::Synthesized));
}
@@ -1951,6 +1950,7 @@ LookupConformanceInModuleRequest::evaluate(
}
// Specific handling of Copyable and Sendable for pack expansions.
// FIXME: Remove.
if (auto packExpansion = type->getAs<PackExpansionType>()) {
if (protocol->isSpecificProtocol(KnownProtocolKind::Copyable) ||
protocol->isSpecificProtocol(KnownProtocolKind::Sendable)) {