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 #36928 from eeckstein/module-build-error-message

Browse Source 
ModuleInterfaceBuilder: give a more specific error message in case of a compiler mismatch
This commit is contained in:
eeckstein
2021-04-16 08:55:32 +02:00
committed by GitHub
parent 0445ff91c5 d49de1a982
commit f53f80ff04
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Frontend/ModuleInterfaceBuilder.cpp
View File

@@ -210,9 +210,14 @@ bool ModuleInterfaceBuilder::buildSwiftModuleInternal(
getSwiftInterfaceCompilerVersionForCurrentCompiler(
SubInstance.getASTContext());
StringRef emittedByCompiler = info.CompilerVersion;
diagnose(diag::module_interface_build_failed, isTypeChecking,
moduleName, emittedByCompiler == builtByCompiler,
emittedByCompiler, builtByCompiler);
if (!isTypeChecking && emittedByCompiler != builtByCompiler) {
diagnose(diag::module_interface_build_failed_mismatching_compiler,
moduleName, emittedByCompiler, builtByCompiler);
} else {
diagnose(diag::module_interface_build_failed, isTypeChecking,
moduleName, emittedByCompiler == builtByCompiler,
emittedByCompiler, builtByCompiler);
}
}
};