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|NFC] Intro diagnoseAndConsumeError

Browse Source 
Intro the service `diagnoseAndConsumeError` as the ultimate site to drop
deserialization issues we can recover from. It will be used to raise
diagnostics on the issues before dropping them silently.
This commit is contained in:
Alexis Laferrière
2023-05-18 14:16:30 -07:00
parent e0014b4ed7
commit a475f4c132
3 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Serialization/ModuleFile.cpp
View File

@@ -328,7 +328,7 @@ void ModuleFile::lookupValue(DeclName name,
if (!declOrError) {
if (!getContext().LangOpts.EnableDeserializationRecovery)
fatal(declOrError.takeError());
llvm::consumeError(declOrError.takeError());
diagnoseAndConsumeError(declOrError.takeError());
continue;
}
auto VD = cast<ValueDecl>(declOrError.get());
@@ -347,7 +347,7 @@ void ModuleFile::lookupValue(DeclName name,
if (!declOrError) {
if (!getContext().LangOpts.EnableDeserializationRecovery)
fatal(declOrError.takeError());
llvm::consumeError(declOrError.takeError());
diagnoseAndConsumeError(declOrError.takeError());
continue;
}
auto VD = cast<ValueDecl>(declOrError.get());
@@ -589,7 +589,7 @@ void ModuleFile::lookupVisibleDecls(ImportPath::Access accessPath,
if (!declOrError) {
if (!getContext().LangOpts.EnableDeserializationRecovery)
fatal(declOrError.takeError());
llvm::consumeError(declOrError.takeError());
diagnoseAndConsumeError(declOrError.takeError());
return;
}
consumer.foundDecl(cast<ValueDecl>(declOrError.get()),
@@ -638,7 +638,7 @@ void ModuleFile::loadExtensions(NominalTypeDecl *nominal) {
if (!declOrError) {
if (!getContext().LangOpts.EnableDeserializationRecovery)
fatal(declOrError.takeError());
llvm::consumeError(declOrError.takeError());
diagnoseAndConsumeError(declOrError.takeError());
}
}
} else {
@@ -651,7 +651,7 @@ void ModuleFile::loadExtensions(NominalTypeDecl *nominal) {
if (!declOrError) {
if (!getContext().LangOpts.EnableDeserializationRecovery)
fatal(declOrError.takeError());
llvm::consumeError(declOrError.takeError());
diagnoseAndConsumeError(declOrError.takeError());
}
}
}
@@ -708,7 +708,7 @@ void ModuleFile::loadDerivativeFunctionConfigurations(
if (!derivativeGenSigOrError) {
if (!getContext().LangOpts.EnableDeserializationRecovery)
fatal(derivativeGenSigOrError.takeError());
llvm::consumeError(derivativeGenSigOrError.takeError());
diagnoseAndConsumeError(derivativeGenSigOrError.takeError());
}
auto derivativeGenSig = derivativeGenSigOrError.get();
// NOTE(TF-1038): Result indices are currently unsupported in derivative
@@ -882,7 +882,7 @@ void ModuleFile::lookupClassMembers(ImportPath::Access accessPath,
if (!decl) {
if (!getContext().LangOpts.EnableDeserializationRecovery)
fatal(decl.takeError());
llvm::consumeError(decl.takeError());
diagnoseAndConsumeError(decl.takeError());
continue;
}
@@ -905,7 +905,7 @@ void ModuleFile::lookupClassMembers(ImportPath::Access accessPath,
if (!decl) {
if (!getContext().LangOpts.EnableDeserializationRecovery)
fatal(decl.takeError());
llvm::consumeError(decl.takeError());
diagnoseAndConsumeError(decl.takeError());
continue;
}