From 8ec341eac4125f48425c1d3a8efde189003402bf Mon Sep 17 00:00:00 2001
From: Artem Chikin <achikin@apple.com>
Date: Thu, 29 May 2025 14:09:20 -0700
Subject: [PATCH] [Dependency Scanning] Bridge diagnostics emitted during
 bridging header scanning

Instead of simply dumping them to stderr.

Resolves rdar://151993075
---
 include/swift/AST/DiagnosticsSema.def             |  1 +
 lib/DependencyScan/ModuleDependencyScanner.cpp    | 10 ++++------
 test/ScanDependencies/bridging_header_error.swift |  7 +++++++
 test/ScanDependencies/clang_scan_error.swift      |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 test/ScanDependencies/bridging_header_error.swift

diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
index da779db7a8cb2..4655673cc6fcf 100644
--- a/include/swift/AST/DiagnosticsSema.def
+++ b/include/swift/AST/DiagnosticsSema.def
@@ -2374,6 +2374,7 @@ NOTE(dependency_as_imported_by_main_module,none,
 NOTE(dependency_as_imported_by, none,
      "a dependency of %select{Swift|Clang}2 module '%0': '%1'", (StringRef, StringRef, bool))
 ERROR(clang_dependency_scan_error, none, "Clang dependency scanner failure: %0", (StringRef))
+ERROR(clang_header_dependency_scan_error, none, "Bridging header dependency scan failure: %0", (StringRef))
 
 // Enum annotations
 ERROR(indirect_case_without_payload,none,
diff --git a/lib/DependencyScan/ModuleDependencyScanner.cpp b/lib/DependencyScan/ModuleDependencyScanner.cpp
index 5e0848c776070..b10ffb572d9dd 100644
--- a/lib/DependencyScan/ModuleDependencyScanner.cpp
+++ b/lib/DependencyScan/ModuleDependencyScanner.cpp
@@ -419,7 +419,7 @@ bool ModuleDependencyScanningWorker::scanHeaderDependenciesOfSwiftModule(
     };
 
     auto dependencies = clangScanningTool.getTranslationUnitDependencies(
-        /*ACTODO:*/ inputSpecificClangScannerCommand(clangScanningBaseCommandLineArgs, headerPath),
+        inputSpecificClangScannerCommand(clangScanningBaseCommandLineArgs, headerPath),
         clangScanningWorkingDirectoryPath,
         cache.getAlreadySeenClangModules(), lookupModuleOutput, sourceBuffer);
     if (!dependencies)
@@ -449,11 +449,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;
   }
 
diff --git a/test/ScanDependencies/bridging_header_error.swift b/test/ScanDependencies/bridging_header_error.swift
new file mode 100644
index 0000000000000..6aa471f6f6cd3
--- /dev/null
+++ b/test/ScanDependencies/bridging_header_error.swift
@@ -0,0 +1,7 @@
+// REQUIRES: objc_interop
+// RUN: %empty-directory(%t)
+// RUN: %empty-directory(%t/module-cache)
+
+// RUN: %target-swift-frontend -scan-dependencies -module-cache-path %t/module-cache %s -o %t/deps.json -import-objc-header %t/does-this-header-even-exist.h &> %t/diagnostic_output.txt
+// RUN: cat %t/diagnostic_output.txt | %FileCheck %s
+// CHECK: error: Bridging header dependency scan failure: error: no such file or directory: '{{.*}}does-this-header-even-exist.h'
diff --git a/test/ScanDependencies/clang_scan_error.swift b/test/ScanDependencies/clang_scan_error.swift
index daae527946834..3ecc0b6d6b5cb 100644
--- a/test/ScanDependencies/clang_scan_error.swift
+++ b/test/ScanDependencies/clang_scan_error.swift
@@ -6,7 +6,7 @@
 // RUN:   -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \
 // RUN:   -o %t/deps.json -I %t -swift-version 5 2>&1 | %FileCheck %s
 
-// CHECK: error: Clang dependency scanner failure: failed to scan header dependencies
+// CHECK: error: Bridging header dependency scan failure: {{.*}}bridging.h:1:10: fatal error: 'do-not-exist.h' file not found
 
 //--- bridging.h
 #include "do-not-exist.h"