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 #81850 from artemcm/BridgeHeaderScanDiagnostics

Browse Source 
[Dependency Scanning] Bridge diagnostics emitted during bridging header scanning
This commit is contained in:
Artem Chikin
2025-05-30 18:36:16 -07:00
committed by GitHub
parent ea63d04b6c 8ec341eac4
commit bb6967bcb9
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/DependencyScan/ModuleDependencyScanner.cpp
View File

@@ -420,7 +420,7 @@ bool ModuleDependencyScanningWorker::scanHeaderDependenciesOfSwiftModule(
};
auto dependencies = clangScanningTool.getTranslationUnitDependencies(
/*ACTODO:*/ inputSpecificClangScannerCommand(clangScanningBaseCommandLineArgs, headerPath),
inputSpecificClangScannerCommand(clangScanningBaseCommandLineArgs, headerPath),
clangScanningWorkingDirectoryPath,
cache.getAlreadySeenClangModules(), lookupModuleOutput, sourceBuffer);
if (!dependencies)
@@ -450,11 +450,9 @@ bool ModuleDependencyScanningWorker::scanHeaderDependenciesOfSwiftModule(
// - Binary module dependnecies may have arbitrary header inputs.
auto clangModuleDependencies = scanHeaderDependencies();
if (!clangModuleDependencies) {
// FIXME: Route this to a normal diagnostic.
llvm::logAllUnhandledErrors(clangModuleDependencies.takeError(),
llvm::errs());
ctx.Diags.diagnose(SourceLoc(), diag::clang_dependency_scan_error,
"failed to scan header dependencies");
auto errorStr = toString(clangModuleDependencies.takeError());
workerASTContext->Diags.diagnose(
SourceLoc(), diag::clang_header_dependency_scan_error, errorStr);
return true;
}