Skip to content

Commit d1ef379

Browse files
authored
Merge pull request #77585 from artemcm/RemoveExtraneousErrorFromHeaderScan
[Dependency Scan] Remove newly-introduced error failure on missing header dependency of a binary module dependency
2 parents 1965f96 + d68b5b2 commit d1ef379

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

lib/ClangImporter/ClangModuleDependencyScanner.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -552,15 +552,8 @@ bool ClangImporter::getHeaderDependencies(
552552
auto swiftBinaryDeps = targetModuleInfo.getAsSwiftBinaryModule();
553553
if (!swiftBinaryDeps->headerImport.empty()) {
554554
auto clangModuleDependencies = scanHeaderDependencies(swiftBinaryDeps->headerImport);
555-
if (!clangModuleDependencies) {
556-
// FIXME: Route this to a normal diagnostic.
557-
llvm::logAllUnhandledErrors(clangModuleDependencies.takeError(),
558-
llvm::errs());
559-
Impl.SwiftContext.Diags.diagnose(
560-
SourceLoc(), diag::clang_dependency_scan_error,
561-
"failed to scan header dependencies");
555+
if (!clangModuleDependencies)
562556
return true;
563-
}
564557
}
565558
}
566559

0 commit comments

Comments
 (0)