Merge pull request #82519 from AnthonyLatsis/rebranch

Revert "ClangImporter: Refactor Clang invocation path remapping after…

Author: AnthonyLatsis

lib/ClangImporter/ClangImporter.cpp

@@ -27,7 +27,6 @@
 #include "swift/AST/Decl.h"
 #include "swift/AST/DiagnosticEngine.h"
 #include "swift/AST/DiagnosticsClangImporter.h"
-#include "swift/AST/DiagnosticsFrontend.h"
 #include "swift/AST/DiagnosticsSema.h"
 #include "swift/AST/Evaluator.h"
 #include "swift/AST/IRGenOptions.h"
@@ -4236,19 +4235,8 @@ ClangImporter::getSwiftExplicitModuleDirectCC1Args() const {
   if (!Impl.SwiftContext.SearchPathOpts.ScannerPrefixMapper.empty()) {
     // Remap all the paths if requested.
     llvm::PrefixMapper Mapper;
-    SmallVector<llvm::MappedPrefix> Prefixes;
-    if (auto E = llvm::MappedPrefix::transformJoined(
-            Impl.SwiftContext.SearchPathOpts.ScannerPrefixMapper, Prefixes)) {
-      // Take permanent ownership of this string. In general the diagnostic
-      // might outlive this function.
-      auto errorMessage =
-          Impl.SwiftContext.AllocateCopy(llvm::toString(std::move(E)));
-      Impl.SwiftContext.Diags.diagnose(SourceLoc(), diag::error_prefix_mapping,
-                                       errorMessage);
-    }
-    Mapper.addRange(Prefixes);
-    Mapper.sort();
-
+    clang::tooling::dependencies::DepscanPrefixMapping::configurePrefixMapper(
+        Impl.SwiftContext.SearchPathOpts.ScannerPrefixMapper, Mapper);
     clang::tooling::dependencies::DepscanPrefixMapping::remapInvocationPaths(
         instance, Mapper);
     instance.getFrontendOpts().PathPrefixMappings.clear();