averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that we record the @unsafe for conformances introduced via extensions

Browse Source
This commit is contained in:
Doug Gregor
2025-01-10 17:02:53 -08:00
parent aea6b38584
commit f14baef7f4
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/AST/ConformanceLookupTable.cpp
View File

@@ -166,13 +166,17 @@ namespace {
/// The location of the "preconcurrency" attribute if present.
const SourceLoc preconcurrencyLoc;
/// The location of the "unsafe" attribute if present.
const SourceLoc unsafeLoc;
ConformanceConstructionInfo() { }
ConformanceConstructionInfo(ProtocolDecl *item, SourceLoc loc,
SourceLoc uncheckedLoc,
SourceLoc preconcurrencyLoc)
SourceLoc preconcurrencyLoc,
SourceLoc unsafeLoc)
: Located(item, loc), uncheckedLoc(uncheckedLoc),
preconcurrencyLoc(preconcurrencyLoc) {}
preconcurrencyLoc(preconcurrencyLoc), unsafeLoc(unsafeLoc) {}
};
}
@@ -228,7 +232,7 @@ void ConformanceLookupTable::forEachInStage(ConformanceStage stage,
registerProtocolConformances(next, conformances);
for (auto conf : conformances) {
protocols.push_back(
{conf->getProtocol(), SourceLoc(), SourceLoc(), SourceLoc()});
{conf->getProtocol(), SourceLoc(), SourceLoc(), SourceLoc(), SourceLoc()});
}
} else if (next->getParentSourceFile() ||
next->getParentModule()->isBuiltinModule()) {
@@ -238,7 +242,8 @@ void ConformanceLookupTable::forEachInStage(ConformanceStage stage,
getDirectlyInheritedNominalTypeDecls(next, inverses, anyObject)) {
if (auto proto = dyn_cast<ProtocolDecl>(found.Item))
protocols.push_back(
{proto, found.Loc, found.uncheckedLoc, found.preconcurrencyLoc});
{proto, found.Loc, found.uncheckedLoc,
found.preconcurrencyLoc, found.unsafeLoc});
}
}
@@ -343,7 +348,8 @@ void ConformanceLookupTable::updateLookupTable(NominalTypeDecl *nominal,
addProtocol(
locAndProto.Item, locAndProto.Loc,
source.withUncheckedLoc(locAndProto.uncheckedLoc)
.withPreconcurrencyLoc(locAndProto.preconcurrencyLoc));
.withPreconcurrencyLoc(locAndProto.preconcurrencyLoc)
.withUnsafeLoc(locAndProto.unsafeLoc));
});
break;