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] Drop subscripts and initializers with problem types.

Browse Source 
Finishes up the "big four" non-type decl kinds. Unfortunately,
indiscriminately dropping members from a class affects the layout
of its vtable. That issue is tracked by rdar://problem/31878396.
This commit is contained in:
Jordan Rose
2017-04-27 18:06:08 -07:00
parent 59a2545a7f
commit db1fc95b69
3 changed files with 106 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/Serialization/Deserialization.cpp
View File

@@ -2525,13 +2525,20 @@ ModuleFile::getDeclChecked(DeclID DID, Optional<DeclContext *> ForcedContext) {
Optional<swift::CtorInitializerKind> initKind =
getActualCtorInitializerKind(storedInitKind);
auto errorKind = DeclDeserializationError::Normal;
if (initKind == CtorInitializerKind::Designated)
errorKind = DeclDeserializationError::DesignatedInitializer;
auto overridden = getDeclChecked(overriddenID);
if (!overridden) {
llvm::consumeError(overridden.takeError());
auto kind = OverrideError::Normal;
if (initKind == CtorInitializerKind::Designated)
kind = OverrideError::DesignatedInitializer;
return llvm::make_error<OverrideError>(name, kind);
return llvm::make_error<OverrideError>(name, errorKind);
}
auto canonicalType = getTypeChecked(canonicalTypeID);
if (!canonicalType) {
return llvm::make_error<TypeError>(
name, takeErrorInfo(canonicalType.takeError()), errorKind);
}
auto parent = getDeclContext(contextID);
@@ -2629,8 +2636,10 @@ ModuleFile::getDeclChecked(DeclID DID, Optional<DeclContext *> ForcedContext) {
}
auto canonicalType = getTypeChecked(canonicalTypeID);
if (!canonicalType)
return llvm::make_error<TypeError>(name, takeErrorInfo(canonicalType.takeError()));
if (!canonicalType) {
return llvm::make_error<TypeError>(
name, takeErrorInfo(canonicalType.takeError()));
}
auto DC = ForcedContext ? *ForcedContext : getDeclContext(contextID);
if (declOrOffset.isComplete())
@@ -2757,13 +2766,21 @@ ModuleFile::getDeclChecked(DeclID DID, Optional<DeclContext *> ForcedContext) {
}
auto canonicalType = getTypeChecked(canonicalTypeID);
if (!canonicalType)
return llvm::make_error<TypeError>(name, takeErrorInfo(canonicalType.takeError()));
if (!canonicalType) {
return llvm::make_error<TypeError>(
name, takeErrorInfo(canonicalType.takeError()));
}
auto DC = getDeclContext(contextID);
if (declOrOffset.isComplete())
return declOrOffset;
// If we are an accessor on a var or subscript, make sure it is deserialized
// first.
auto accessor = getDeclChecked(accessorStorageDeclID);
if (!accessor)
return accessor.takeError();
// Read generic params before reading the type, because the type may
// reference generic parameters, and we want them to have a dummy
// DeclContext for now.
@@ -2844,10 +2861,6 @@ ModuleFile::getDeclChecked(DeclID DID, Optional<DeclContext *> ForcedContext) {
fn->setImplicit();
fn->setMutating(isMutating);
fn->setDynamicSelf(hasDynamicSelf);
// If we are an accessor on a var or subscript, make sure it is deserialized
// too.
getDecl(accessorStorageDeclID);
break;
}
@@ -3289,6 +3302,12 @@ ModuleFile::getDeclChecked(DeclID DID, Optional<DeclContext *> ForcedContext) {
return llvm::make_error<OverrideError>(name);
}
auto canonicalType = getTypeChecked(canonicalTypeID);
if (!canonicalType) {
return llvm::make_error<TypeError>(
name, takeErrorInfo(canonicalType.takeError()));
}
auto parent = getDeclContext(contextID);
if (declOrOffset.isComplete())
return declOrOffset;
@@ -4342,6 +4361,9 @@ void ModuleFile::loadAllMembers(Decl *container, uint64_t contextData) {
fatal(next.takeError());
// Drop the member if it had a problem.
// FIXME: If this was a non-final, non-dynamic, non-@objc-overriding
// member, it's going to affect the vtable layout, and /every single call/
// will be wrong.
if (auto *containingClass = dyn_cast<ClassDecl>(container)) {
auto handleMissingDesignatedInit =
[containingClass](const DeclDeserializationError &error) {