Skip to content

Commit 9ee1911

Browse files
committed
ClangImporter: permit redundancy in the Generate PCM job
`-Xcc` flags are internal to the C compiler; we have `-vfsoverlay` now which directly passes the VFS overlay. Because the VFS overlay flags are automatically passed along to the clang scanner, we need to pass along `-vfsoverlay` to the Swift frontend to ensure that any VFS overlays are honoured. Most likely this was a workaround for `-vfsoverlay` not getting propagated originally and when the restriction was lifted the exercised codepath was not heavily tested.
1 parent c33ce3f commit 9ee1911

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

lib/ClangImporter/ClangModuleDependencyScanner.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,6 @@ ModuleDependencyVector ClangImporter::bridgeClangModuleDependencies(
143143
if (!ctx.CASOpts.EnableCaching) {
144144
auto &overlayFiles = invocation.getMutHeaderSearchOpts().VFSOverlayFiles;
145145
for (auto overlay : overlayFiles) {
146-
if (llvm::is_contained(ctx.SearchPathOpts.VFSOverlayFiles, overlay))
147-
continue;
148146
swiftArgs.push_back("-vfsoverlay");
149147
swiftArgs.push_back(overlay);
150148
}

0 commit comments

Comments
 (0)