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

Eliminate NominalTypeDecl::(get|set)Conformances.

Browse Source 
We now access the conformances of a nominal type through the
conformance lookup table, so there is no reason to continue storing
conformances directly on the nominal type declaration, which was
error-prone regardless. This mirrors the change to ExtensionDecl from
my previous commit.

Swift SVN r26354
This commit is contained in:
Doug Gregor
2015-03-20 16:32:25 +00:00
parent 9bd774fd57
commit 3f6a14ade6
5 changed files with 39 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/AST/Decl.cpp
View File

@@ -781,16 +781,19 @@ void NominalTypeDecl::setMemberLoader(LazyMemberLoader *resolver,
IterableDeclContext::setLoader(resolver, contextData);
}
ArrayRef<ProtocolConformance*> NominalTypeDecl::getConformances() const {
loadAllConformances(this, Conformances);
return Conformances.getArray();
}
void NominalTypeDecl::setConformanceLoader(LazyMemberLoader *resolver,
uint64_t contextData) {
assert(!Conformances.isLazy() && "already have a resolver");
assert(Conformances.getArray().empty() && "already have conformances");
Conformances.setLoader(resolver, contextData);
assert(!HaveConformanceLoader &&
"Already have a conformance loader");
HaveConformanceLoader = true;
getASTContext().recordConformanceLoader(this, resolver, contextData);
}
std::pair<LazyMemberLoader *, uint64_t>
NominalTypeDecl::takeConformanceLoaderSlow() {
assert(HaveConformanceLoader && "no conformance loader?");
HaveConformanceLoader = false;
return getASTContext().takeConformanceLoader(this);
}
ExtensionDecl::ExtensionDecl(SourceLoc extensionLoc,
@@ -878,7 +881,8 @@ void ExtensionDecl::setConformanceLoader(LazyMemberLoader *resolver,
getASTContext().recordConformanceLoader(this, resolver, contextData);
}
std::pair<LazyMemberLoader *, uint64_t> ExtensionDecl::takeConformanceLoaderSlow() {
std::pair<LazyMemberLoader *, uint64_t>
ExtensionDecl::takeConformanceLoaderSlow() {
assert(ExtensionDeclBits.HaveConformanceLoader && "no conformance loader?");
ExtensionDeclBits.HaveConformanceLoader = false;
return getASTContext().takeConformanceLoader(this);