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

Generalize protocol conformance options spelled via attribute and incorporate @unsafe

Browse Source 
Protocol conformances have a handful attributes that can apply to them
directly, including @unchecked (for Sendable), @preconcurrency, and
@retroactive. Generalize this into an option set that we carry around,
so it's a bit easier to add them, as well as reworking the
serialization logic to deal with an arbitrary number of such options.

Use this generality to add support for @unsafe conformances, which are
needed when unsafe witnesses are used to conform to safe requirements.
Implement general support for @unsafe conformances, including
producing a single diagnostic per missing @unsafe that provides a
Fix-It and collects together all of the unsafe witnesses as notes.
This commit is contained in:
Doug Gregor
2024-12-20 22:46:36 -08:00
parent b6e995e7d9
commit 5b90b8851a
32 changed files with 469 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/Frontend/ModuleInterfaceSupport.cpp
View File

@@ -431,8 +431,8 @@ class InheritedProtocolCollector {
using OriginallyDefinedInAttrList =
TinyPtrVector<const OriginallyDefinedInAttr *>;
using ProtocolAndAvailability =
std::tuple<ProtocolDecl *, AvailableAttrList, bool /*isUnchecked*/,
OriginallyDefinedInAttrList>;
std::tuple<ProtocolDecl *, AvailableAttrList,
ProtocolConformanceOptions, OriginallyDefinedInAttrList>;
/// Protocols that will be included by the ASTPrinter without any extra work.
SmallVector<ProtocolDecl *, 8> IncludedProtocols;
@@ -487,10 +487,17 @@ class InheritedProtocolCollector {
return isPublicOrUsableFromInline(type);
}
static bool isUncheckedConformance(ProtocolConformance *conformance) {
static ProtocolConformanceOptions filterOptions(ProtocolConformanceOptions options) {
options -= ProtocolConformanceFlags::Preconcurrency;
options -= ProtocolConformanceFlags::Retroactive;
options -= ProtocolConformanceFlags::Safe;
return options;
}
static ProtocolConformanceOptions getConformanceOptions(ProtocolConformance *conformance) {
if (auto normal = dyn_cast<NormalProtocolConformance>(conformance->getRootConformance()))
return normal->isUnchecked();
return false;
return filterOptions(normal->getOptions());
return {};
}
/// For each type in \p directlyInherited, classify the protocols it refers to
@@ -522,7 +529,8 @@ class InheritedProtocolCollector {
else
ExtraProtocols.push_back(ProtocolAndAvailability(
protoDecl, getAvailabilityAttrs(D, availableAttrs),
inherited.isUnchecked(), getOriginallyDefinedInAttrList(D)));
filterOptions(inherited.getOptions()),
getOriginallyDefinedInAttrList(D)));
}
// FIXME: This ignores layout constraints, but currently we don't support
// any of those besides 'AnyObject'.
@@ -541,7 +549,7 @@ class InheritedProtocolCollector {
continue;
ExtraProtocols.push_back(ProtocolAndAvailability(
conf->getProtocol(), getAvailabilityAttrs(D, availableAttrs),
isUncheckedConformance(conf), getOriginallyDefinedInAttrList(D)));
getConformanceOptions(conf), getOriginallyDefinedInAttrList(D)));
}
}
}
@@ -763,15 +771,13 @@ public:
auto proto = std::get<0>(protoAndAvailability);
auto availability = std::get<1>(protoAndAvailability);
auto isUnchecked = std::get<2>(protoAndAvailability);
auto options = std::get<2>(protoAndAvailability);
auto originallyDefinedInAttrs = std::get<3>(protoAndAvailability);
// Create a synthesized ExtensionDecl for the conformance.
ASTContext &ctx = M->getASTContext();
auto inherits = ctx.AllocateCopy(llvm::ArrayRef(InheritedEntry(
TypeLoc::withoutLoc(proto->getDeclaredInterfaceType()), isUnchecked,
/*isRetroactive=*/false,
/*isPreconcurrency=*/false)));
TypeLoc::withoutLoc(proto->getDeclaredInterfaceType()), options)));
auto extension =
ExtensionDecl::create(ctx, SourceLoc(), nullptr, inherits,
nominal->getModuleScopeContext(), nullptr);