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

ModuleInterface: Use SemanticAvailableAttr.

Browse Source
This commit is contained in:
Allan Shortlidge
2025-01-06 11:31:19 -08:00
parent dcfe563294
commit f9f8cfb7ee
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Frontend/ModuleInterfaceSupport.cpp
View File

@@ -427,7 +427,7 @@ namespace {
class InheritedProtocolCollector {
static const StringLiteral DummyProtocolName;
using AvailableAttrList = TinyPtrVector<const AvailableAttr *>;
using AvailableAttrList = SmallVector<SemanticAvailableAttr>;
using OriginallyDefinedInAttrList =
TinyPtrVector<const OriginallyDefinedInAttr *>;
using ProtocolAndAvailability =
@@ -451,14 +451,13 @@ class InheritedProtocolCollector {
cache.emplace();
while (D) {
for (auto semanticAttr : D->getSemanticAvailableAttrs()) {
auto nextAttr = semanticAttr.getParsedAttr();
for (auto nextAttr : D->getSemanticAvailableAttrs()) {
// FIXME: This is just approximating the effects of nested availability
// attributes for the same platform; formally they'd need to be merged.
bool alreadyHasMoreSpecificAttrForThisPlatform =
llvm::any_of(*cache, [nextAttr](const AvailableAttr *existingAttr) {
return existingAttr->getPlatform() == nextAttr->getPlatform();
// FIXME: [availability] This should compare availability domains.
bool alreadyHasMoreSpecificAttrForThisPlatform = llvm::any_of(
*cache, [nextAttr](SemanticAvailableAttr existingAttr) {
return existingAttr.getPlatform() == nextAttr.getPlatform();
});
if (alreadyHasMoreSpecificAttrForThisPlatform)
continue;
@@ -785,8 +784,9 @@ public:
// Build up synthesized DeclAttributes for the extension.
TinyPtrVector<const DeclAttribute *> clonedAttrs;
for (auto *attr : availability) {
clonedAttrs.push_back(attr->clone(ctx, /*implicit*/ true));
for (auto attr : availability) {
clonedAttrs.push_back(
attr.getParsedAttr()->clone(ctx, /*implicit*/ true));
}
for (auto *attr : proto->getAttrs().getAttributes<SPIAccessControlAttr>()) {
clonedAttrs.push_back(attr->clone(ctx, /*implicit*/ true));