Merge pull request #82935 from compnerd/department-of-redundancy-department

compnerd · web-flow · commit c3fdab2f206d · 2025-07-09T20:44:42.000-07:00
ClangImporter: permit redundancy in the Generate PCM job
diff --git a/lib/ClangImporter/ClangModuleDependencyScanner.cpp b/lib/ClangImporter/ClangModuleDependencyScanner.cpp
@@ -143,8 +143,6 @@ ModuleDependencyVector ClangImporter::bridgeClangModuleDependencies(
     if (!ctx.CASOpts.EnableCaching) {
       auto &overlayFiles = invocation.getMutHeaderSearchOpts().VFSOverlayFiles;
       for (auto overlay : overlayFiles) {
-        if (llvm::is_contained(ctx.SearchPathOpts.VFSOverlayFiles, overlay))
-          continue;
         swiftArgs.push_back("-vfsoverlay");
         swiftArgs.push_back(overlay);
       }

Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,6 @@ ModuleDependencyVector ClangImporter::bridgeClangModuleDependencies(`
`143`	`143`	`if (!ctx.CASOpts.EnableCaching) {`
`144`	`144`	`auto &overlayFiles = invocation.getMutHeaderSearchOpts().VFSOverlayFiles;`
`145`	`145`	`for (auto overlay : overlayFiles) {`
`146`		`- if (llvm::is_contained(ctx.SearchPathOpts.VFSOverlayFiles, overlay))`
`147`		`- continue;`
`148`	`146`	`swiftArgs.push_back("-vfsoverlay");`
`149`	`147`	`swiftArgs.push_back(overlay);`
`150`	`148`	`}`