Merge pull request #1872 from cachemeifyoucan/eng/PR-block-list-remap-fallout-6.2

[6.2][Caching] Fix a fallout from block list remap

Author: cachemeifyoucan

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -356,7 +356,7 @@ extension Driver {
     if isFrontendArgSupported(.blockListFile) {
       try findBlocklists().forEach {
         commandLine.appendFlag(.blockListFile)
-        try addPathArgument(VirtualPath.absolute($0), to: &commandLine)
+        try addPathArgument(VirtualPath.absolute($0), to: &commandLine, remap: jobNeedPathRemap)
       }
     }
 

TestInputs/Dummy.xctoolchain/usr/local/lib/swift/blocklists/block-list1.yml

@@ -1 +1,2 @@
 ---
+key: value

TestInputs/Dummy.xctoolchain/usr/local/lib/swift/blocklists/block-list2.yaml

@@ -1 +1,2 @@
 ---
+key: value

Tests/SwiftDriverTests/CachingBuildTests.swift

@@ -901,8 +901,7 @@ final class CachingBuildTests: XCTestCase {
       var driver = try Driver(args: ["swiftc",
                                      "-I", cHeadersPath.nativePathString(escaped: true),
                                      "-I", swiftModuleInterfacesPath.nativePathString(escaped: true),
-                                     "/tmp/Foo.o", "-g",
-                                     "-explicit-module-build",
+                                     "-g", "-explicit-module-build",
                                      "-cache-compile-job", "-cas-path", casPath.nativePathString(escaped: true),
                                      "-working-directory", path.nativePathString(escaped: true),
                                      "-disable-clang-target", "-scanner-prefix-map-sdk", "/^sdk",
@@ -944,6 +943,9 @@ final class CachingBuildTests: XCTestCase {
         XCTAssertFalse(command.contains { $0 == "-plugin-path" || $0 == "-external-plugin-path" ||
                                           $0 == "-load-plugin-library" || $0 == "-load-plugin-executable" })
       }
+
+      try driver.run(jobs: jobs)
+      XCTAssertFalse(driver.diagnosticEngine.hasErrors)
     }
   }