Merge pull request swiftlang#75350 from cachemeifyoucan/eng/PR-131940130-swift-6

[6.0][CrossImport][PrefixMap] Make sure overlay file is remapped if used

Author: cachemeifyoucan

lib/DependencyScan/ModuleDependencyScanner.cpp

@@ -950,7 +950,8 @@ void ModuleDependencyScanner::discoverCrossImportOverlayDependencies(
     mainDep.addAuxiliaryFile(entry.second);
     cmdCopy.push_back("-swift-module-cross-import");
     cmdCopy.push_back(entry.first);
-    cmdCopy.push_back(entry.second);
+    auto overlayPath = cache.getScanService().remapPath(entry.second);
+    cmdCopy.push_back(overlayPath);
   }
   mainDep.updateCommandLine(cmdCopy);
 

test/CAS/path_remap.swift

@@ -4,10 +4,14 @@
 // RUN: %target-swift-frontend -scan-dependencies -module-name Test -module-cache-path %t/clang-module-cache -O \
 // RUN:   -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \
 // RUN:   %t/main.swift -o %t/deps.json -swift-version 5 -cache-compile-job -cas-path %t/cas -I %t/include \
-// RUN:   -scanner-prefix-map %swift_src_root=/^src -scanner-prefix-map %t=/^tmp
+// RUN:   -scanner-prefix-map %swift_src_root=/^src -scanner-prefix-map %t=/^tmp -enable-cross-import-overlays
 
 // RUN: %{python} %S/Inputs/BuildCommandExtractor.py %t/deps.json A > %t/A.cmd
 // RUN: %swift_frontend_plain @%t/A.cmd
+// RUN: %{python} %S/Inputs/BuildCommandExtractor.py %t/deps.json B > %t/B.cmd
+// RUN: %swift_frontend_plain @%t/B.cmd
+// RUN: %{python} %S/Inputs/BuildCommandExtractor.py %t/deps.json _B_A > %t/BA.cmd
+// RUN: %swift_frontend_plain @%t/BA.cmd
 
 // RUN: %{python} %S/Inputs/GenerateExplicitModuleMap.py %t/deps.json > %t/map.json
 // RUN: llvm-cas --cas %t/cas --make-blob --data %t/map.json > %t/map.casid
@@ -19,7 +23,7 @@
 // RUN:   -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \
 // RUN:   -module-name Test -explicit-swift-module-map-file @%t/map.casid \
 // RUN:   -cache-replay-prefix-map /^src=%swift_src_root -cache-replay-prefix-map /^tmp=%t \
-// RUN:   /^tmp/main.swift @%t/MyApp.cmd
+// RUN:   /^tmp/main.swift @%t/MyApp.cmd -enable-cross-import-overlays
 
 // RUN: %swift-scan-test -action compute_cache_key_from_index -cas-path %t/cas -input 0 -- \
 // RUN:   %target-swift-frontend \
@@ -28,7 +32,7 @@
 // RUN:   -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \
 // RUN:   -module-name Test -explicit-swift-module-map-file @%t/map.casid \
 // RUN:   -cache-replay-prefix-map /^src=%swift_src_root -cache-replay-prefix-map /^tmp=%t \
-// RUN:   /^tmp/main.swift @%t/MyApp.cmd > %t/key.casid
+// RUN:   /^tmp/main.swift @%t/MyApp.cmd -enable-cross-import-overlays > %t/key.casid
 
 // RUN: %swift-scan-test -action replay_result -cas-path %t/cas -id @%t/key.casid -- \
 // RUN:   %target-swift-frontend \
@@ -37,15 +41,32 @@
 // RUN:   -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib \
 // RUN:   -module-name Test -explicit-swift-module-map-file @%t/map.casid \
 // RUN:   -cache-replay-prefix-map /^src=%swift_src_root -cache-replay-prefix-map /^tmp=%t \
-// RUN:   /^tmp/main.swift @%t/MyApp.cmd
+// RUN:   /^tmp/main.swift @%t/MyApp.cmd -enable-cross-import-overlays
 
 //--- main.swift
 import A
+import B
 
 #warning("This is a warning")
 
 //--- include/A.swiftinterface
 // swift-interface-format-version: 1.0
 // swift-module-flags: -module-name A -O -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib -user-module-version 1.0
+public func a() { }
+
+//--- include/B.swiftinterface
+// swift-interface-format-version: 1.0
+// swift-module-flags: -module-name B -O -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib -user-module-version 1.0
 public func b() { }
 
+//--- include/_B_A.swiftinterface
+// swift-interface-format-version: 1.0
+// swift-module-flags: -module-name _B_A -O -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -parse-stdlib -user-module-version 1.0
+public func b_a() { }
+
+//--- include/B.swiftcrossimport/A.swiftoverlay
+%YAML 1.2
+---
+version: 1
+modules:
+  - name: _B_A