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

[Serialization] Drop overridden relationship in constructors when safe

Browse Source 
Deserialization recovery lead the compiler to drop public constructors
overridding internal constructors. This limits the logic to dropping the
overriding relationship instead of the whole constructor. This applies
when the overriden constructor fails to deserialize and only when the
overriding relationship was marked as not affecting ABI.

rdar://104704832
This commit is contained in:
Alexis Laferrière
2023-01-27 13:10:21 -08:00
parent 4665053f5b
commit 9c16b4b013
4 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Serialization/Deserialization.cpp
View File

@@ -3094,7 +3094,7 @@ public:
GenericSignatureID genericSigID;
uint8_t storedInitKind, rawAccessLevel;
DeclID overriddenID;
bool needsNewVTableEntry, firstTimeRequired;
bool overriddenAffectsABI, needsNewVTableEntry, firstTimeRequired;
unsigned numArgNames;
ArrayRef<uint64_t> argNameAndDependencyIDs;
@@ -3104,6 +3104,7 @@ public:
async, throws, storedInitKind,
genericSigID,
overriddenID,
overriddenAffectsABI,
rawAccessLevel,
needsNewVTableEntry,
firstTimeRequired,
@@ -3130,15 +3131,21 @@ public:
attrs.setRawAttributeChain(DAttrs);
}
auto overridden = MF.getDeclChecked(overriddenID);
if (!overridden) {
// Pass through deserialization errors.
if (overridden.errorIsA<FatalDeserializationError>())
return overridden.takeError();
Expected<Decl *> overriddenOrError = MF.getDeclChecked(overriddenID);
Decl *overridden;
if (overriddenOrError) {
overridden = overriddenOrError.get();
} else if (overriddenOrError.errorIsA<FatalDeserializationError>()) {
// Pass through fatal deserialization errors.
return overriddenOrError.takeError();
} else {
llvm::consumeError(overriddenOrError.takeError());
if (overriddenAffectsABI || !ctx.LangOpts.EnableDeserializationRecovery) {
return llvm::make_error<OverrideError>(name, errorFlags,
numVTableEntries);
}
llvm::consumeError(overridden.takeError());
return llvm::make_error<OverrideError>(
name, errorFlags, numVTableEntries);
overridden = nullptr;
}
for (auto dependencyID : argNameAndDependencyIDs.slice(numArgNames)) {
@@ -3198,7 +3205,7 @@ public:
ctx.evaluator.cacheOutput(NeedsNewVTableEntryRequest{ctor},
std::move(needsNewVTableEntry));
ctor->setOverriddenDecl(cast_or_null<ConstructorDecl>(overridden.get()));
ctor->setOverriddenDecl(cast_or_null<ConstructorDecl>(overridden));
if (auto *overridden = ctor->getOverriddenDecl()) {
if (!attributeChainContains<RequiredAttr>(DAttrs) ||
!overridden->isRequired()) {