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

Merge pull request #63639 from xymus/serial-precise-tag

Browse Source 
[Serialization] Don't fail the precise tag check if only the last digit doesn't match
This commit is contained in:
Alexis Laferrière
2023-02-14 09:31:31 -08:00
committed by GitHub
parent 075150cf90 a5ccbf3264
commit 9a1a32cd9b
8 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -845,6 +845,13 @@ LoadedFile *SerializedModuleLoaderBase::loadAST(
if (loadedModuleFile &&
loadedModuleFile->mayHaveDiagnosticsPointingAtBuffer())
OrphanedModuleFiles.push_back(std::move(loadedModuleFile));
} else {
// Report non-fatal compiler tag mismatch.
if (!loadInfo.problematicRevision.empty()) {
Ctx.Diags.diagnose(*diagLoc,
diag::serialization_module_problematic_revision,
loadInfo.problematicRevision, moduleBufferID);
}
}
// The -experimental-hermetic-seal-at-link flag turns on dead-stripping
@@ -905,7 +912,7 @@ void swift::serialization::diagnoseSerializedASTLoadFailure(
break;
case serialization::Status::RevisionIncompatible:
Ctx.Diags.diagnose(diagLoc, diag::serialization_module_incompatible_revision,
ModuleName, moduleBufferID);
loadInfo.problematicRevision, ModuleName, moduleBufferID);
break;
case serialization::Status::Malformed:
Ctx.Diags.diagnose(diagLoc, diag::serialization_malformed_module,