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

[Serialization/AST] Lazy generic enviroments for extensions.

Browse Source
This commit is contained in:
Doug Gregor
2016-12-12 20:46:47 -08:00
parent 369f362eb4
commit d86c4a8f42
4 changed files with 90 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Serialization/Deserialization.cpp
View File

@@ -920,7 +920,8 @@ uint64_t ModuleFile::allocateLazyGenericEnvironmentMap(
return reinterpret_cast<uint64_t>(storedGenericEnvMap);
}
void ModuleFile::readLazyGenericEnvironment(GenericTypeDecl *type) {
void ModuleFile::readLazyGenericEnvironment(
llvm::PointerUnion<GenericTypeDecl *, ExtensionDecl *> typeOrExt) {
// Read the generic environment.
GenericSignature *genericSig;
TypeSubstitutionMap genericEnvMap;
@@ -929,9 +930,13 @@ void ModuleFile::readLazyGenericEnvironment(GenericTypeDecl *type) {
// Set up the lazy generic environment.
if (genericSig) {
type->setLazyGenericEnvironment(
this, genericSig,
allocateLazyGenericEnvironmentMap(std::move(genericEnvMap)));
auto lazyMap = allocateLazyGenericEnvironmentMap(std::move(genericEnvMap));
if (auto type = typeOrExt.dyn_cast<GenericTypeDecl *>()) {
type->setLazyGenericEnvironment(this, genericSig, lazyMap);
} else {
auto ext = typeOrExt.get<ExtensionDecl *>();
ext->setLazyGenericEnvironment(this, genericSig, lazyMap);
}
}
}
@@ -3293,8 +3298,7 @@ Decl *ModuleFile::getDecl(DeclID DID, Optional<DeclContext *> ForcedContext) {
GenericParamList *genericParams = maybeReadGenericParams(DC);
extension->setGenericParams(genericParams);
auto *env = maybeReadGenericEnvironment();
extension->setGenericEnvironment(env);
readLazyGenericEnvironment(extension);
extension->setMemberLoader(this, DeclTypeCursor.GetCurrentBitNo());
skipRecord(DeclTypeCursor, decls_block::MEMBERS);
@@ -4379,6 +4383,8 @@ GenericEnvironment *ModuleFile::loadGenericEnvironment(const Decl *decl,
genericSig = func->getGenericSignature();
else if (auto type = dyn_cast<GenericTypeDecl>(decl))
genericSig = type->getGenericSignature();
else if (auto ext = dyn_cast<ExtensionDecl>(decl))
genericSig = ext->getGenericSignature();
else
llvm_unreachable("Cannot lazily deserialize generic environment");