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

Store the Module of a ProtocolConformance rather than the decl.

Browse Source 
This is all we need for linkage and is easier to reliably recover during deserialization.

Swift SVN r6803
This commit is contained in:
Joe Groff
2013-08-01 04:10:52 +00:00
parent 28c53dbf69
commit f4eed420b3
5 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Serialization/ModuleFile.cpp
View File

@@ -237,11 +237,11 @@ Optional<ConformancePair> ModuleFile::maybeReadConformance(Type conformingType){
return std::make_pair(cast<ProtocolDecl>(getDecl(protoID)), nullptr);
}
DeclID protoID, conformingDeclID;
DeclID protoID;
unsigned valueCount, typeCount, inheritedCount, defaultedCount;
ArrayRef<uint64_t> rawIDs;
ProtocolConformanceLayout::readRecord(scratch, protoID, conformingDeclID,
ProtocolConformanceLayout::readRecord(scratch, protoID,
valueCount, typeCount,
inheritedCount, defaultedCount,
rawIDs);
@@ -258,11 +258,6 @@ Optional<ConformancePair> ModuleFile::maybeReadConformance(Type conformingType){
ASTContext &ctx = ModuleContext->Ctx;
auto proto = cast<ProtocolDecl>(getDecl(protoID));
// FIXME: Deserialize the conforming decl. This currently asserts out if the
// conforming decl is an ExtensionDecl, with "cannot cross-reference this
// kind of decl".
// auto conformingDecl = getDecl(conformingDeclID);
Decl *conformingDecl = nullptr;
WitnessMap witnesses;
ArrayRef<uint64_t>::iterator rawIDIter = rawIDs.begin();
@@ -307,7 +302,7 @@ Optional<ConformancePair> ModuleFile::maybeReadConformance(Type conformingType){
std::unique_ptr<ProtocolConformance> conformance(
new ProtocolConformance(conformingType,
proto,
conformingDecl,
ModuleContext,
std::move(witnesses),
std::move(typeWitnesses),
std::move(inheritedConformances),