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

separate out handleErrorAndSupplyMissingClassMember

Browse Source
This commit is contained in:
David Ungar
2017-08-25 17:33:45 -07:00
parent 0de6b7a667
commit 200a52d656
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Serialization/Deserialization.cpp
View File

@@ -4534,6 +4534,9 @@ void ModuleFile::loadAllMembers(Decl *container, uint64_t contextData) {
}
}
static Decl *handleErrorAndSupplyMissingClassMember(ASTContext &context,
llvm::Error &&error,
ClassDecl *containingClass);
static Decl *handleErrorAndSupplyMissingProtoMember(ASTContext &context,
llvm::Error &&error,
ProtocolDecl *containingProto);
@@ -4544,6 +4547,20 @@ Decl *handleErrorAndSupplyMissingMember(ASTContext& context, Decl *container, ll
// Drop the member if it had a problem.
// FIXME: Handle overridable members in class extensions too, someday.
if (auto *containingClass = dyn_cast<ClassDecl>(container)) {
suppliedMissingMember = handleErrorAndSupplyMissingClassMember(context, std::move(error), containingClass);
} else if (auto *containingProto = dyn_cast<ProtocolDecl>(container)) {
suppliedMissingMember = handleErrorAndSupplyMissingProtoMember(context, std::move(error), containingProto);
}
else {
suppliedMissingMember = handleErrorAndSupplyMissingMiscMember(std::move(error));
}
return suppliedMissingMember;
}
Decl *handleErrorAndSupplyMissingClassMember(ASTContext &context,
llvm::Error &&error,
ClassDecl *containingClass) {
Decl *suppliedMissingMember = nullptr;
auto handleMissingClassMember =
[&](const DeclDeserializationError &error) {
if (error.isDesignatedInitializer())
@@ -4564,14 +4581,9 @@ Decl *handleErrorAndSupplyMissingMember(ASTContext& context, Decl *container, ll
// subscripts, and methods that don't need vtable entries.
};
llvm::handleAllErrors(std::move(error), handleMissingClassMember);
} else if (auto *containingProto = dyn_cast<ProtocolDecl>(container)) {
suppliedMissingMember = handleErrorAndSupplyMissingProtoMember(context, std::move(error), containingProto);
}
else {
suppliedMissingMember = handleErrorAndSupplyMissingMiscMember(std::move(error));
}
return suppliedMissingMember;
}
Decl *handleErrorAndSupplyMissingProtoMember(ASTContext &context,
llvm::Error &&error,