averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2026-06-20 15:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ModuleInterface: Fix availability attributes on synthesized conformances."

Browse Source 
This reverts commit 457debcf4d.

Resolves rdar://172144339.
This commit is contained in:
Allan Shortlidge
2026-03-10 14:27:11 -07:00
parent eae5b17315
commit a2a120daab
2 changed files with 6 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Frontend/ModuleInterfaceSupport.cpp
+6 -15
View File
@@ -453,27 +453,18 @@ class InheritedProtocolCollector {
return cache.value();
cache.emplace();
// Start with the decl itself and add its @available attributes to the list.
// Then do the same for each parent declaration, but skip adding new
// availability attributes if they would be superceded by an attribute on a
// nested declaration since those take precedence.
// FIXME: This is just approximating the effects of nested availability
// attributes for the same platform; formally they'd need to be merged.
llvm::SmallVector<SemanticAvailableAttr, 8> pendingAttrs;
while (D) {
for (auto nextAttr : D->getSemanticAvailableAttrs()) {
bool hasMoreSpecificAttribute = llvm::any_of(
// 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](SemanticAvailableAttr existingAttr) {
return existingAttr.getDomain().contains(nextAttr.getDomain());
return existingAttr.getDomain() == nextAttr.getDomain();
});
if (hasMoreSpecificAttribute)
if (alreadyHasMoreSpecificAttrForThisPlatform)
continue;
pendingAttrs.push_back(nextAttr);
cache->push_back(nextAttr);
}
cache->append(pendingAttrs);
pendingAttrs.clear();
D = D->getDeclContext()->getAsDecl();
}