Update swift compiler after clang gmodule CAS build update

Fix swift compiler build and test to work with new clang gmodule build
with CAS, which encodes references to clang PCMs as CASIDs.

Author: cachemeifyoucan

lib/DependencyScan/ScanDependencies.cpp

@@ -147,7 +147,8 @@ class ExplicitModuleDependencyResolver {
           bridgingHeaderBuildCmd.push_back("-Xcc");
           bridgingHeaderBuildCmd.push_back("-fmodule-file-cache-key");
           bridgingHeaderBuildCmd.push_back("-Xcc");
-          bridgingHeaderBuildCmd.push_back(clangDep->mappedPCMPath);
+          bridgingHeaderBuildCmd.push_back(
+              llvm::sys::path::filename(clangDep->mappedPCMPath).str());
           bridgingHeaderBuildCmd.push_back("-Xcc");
           bridgingHeaderBuildCmd.push_back(clangDep->moduleCacheKey);
         }
@@ -277,17 +278,19 @@ class ExplicitModuleDependencyResolver {
   bool handleClangModuleDependency(
       ModuleDependencyID depModuleID,
       const ClangModuleDependencyStorage &clangDepDetails) {
+    auto pcmPath =
+        llvm::sys::path::filename(clangDepDetails.mappedPCMPath).str();
     if (!resolvingDepInfo.isSwiftSourceModule()) {
       if (!resolvingDepInfo.isClangModule()) {
         commandline.push_back("-Xcc");
         commandline.push_back("-fmodule-file=" + depModuleID.ModuleName + "=" +
-                              clangDepDetails.mappedPCMPath);
+                              pcmPath);
       }
       if (!clangDepDetails.moduleCacheKey.empty()) {
         commandline.push_back("-Xcc");
         commandline.push_back("-fmodule-file-cache-key");
         commandline.push_back("-Xcc");
-        commandline.push_back(clangDepDetails.mappedPCMPath);
+        commandline.push_back(pcmPath);
         commandline.push_back("-Xcc");
         commandline.push_back(clangDepDetails.moduleCacheKey);
       }

lib/IRGen/IRGenDebugInfo.cpp

@@ -929,10 +929,10 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
         // Note: The implementation here assumes that all clang submodules
         //       belong to the same PCM file.
         ASTSourceDescriptor ParentDescriptor(*ClangModule->Parent);
-        Parent = getOrCreateModule({ParentDescriptor.getModuleName(),
-                                    ParentDescriptor.getPath(),
-                                    Desc.getASTFile(), Desc.getSignature()},
-                                   ClangModule->Parent);
+        Parent = getOrCreateModule(
+            {ParentDescriptor.getModuleName(), ParentDescriptor.getPath(),
+             Desc.getASTFile(), Desc.getSignature(), /*CASID=*/""},
+            ClangModule->Parent);
       }
       return getOrCreateModule(ClangModule, Parent, Desc.getModuleName(),
                                IncludePath, Signature, Desc.getASTFile());
@@ -2594,11 +2594,11 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
           // Describe the submodule, but substitute the cached ASTFile from
           // the toplevel module. The ASTFile pointer in SubModule may be
           // dangling and cant be trusted.
-          Scope = getOrCreateModule({SubModuleDesc->getModuleName(),
-                                     SubModuleDesc->getPath(),
-                                     TopLevelModuleDesc->getASTFile(),
-                                     TopLevelModuleDesc->getSignature()},
-                                    SubModuleDesc->getModuleOrNull());
+          Scope = getOrCreateModule(
+              {SubModuleDesc->getModuleName(), SubModuleDesc->getPath(),
+               TopLevelModuleDesc->getASTFile(),
+               TopLevelModuleDesc->getSignature(), /*CASID=*/""},
+              SubModuleDesc->getModuleOrNull());
         else if (SubModuleDesc->getModuleOrNull() == nullptr)
           // This is (bridging header) PCH.
           Scope = getOrCreateModule(*SubModuleDesc, nullptr);

test/CAS/bridging-header.swift

@@ -18,13 +18,13 @@
 // CHECK:         "-dwarf-ext-refs"
 // CHECK:         "-fmodule-file-cache-key",
 // CHECK-NEXT:    "-Xcc",
-// CHECK-NEXT:    "{{.*}}{{/|\\}}A-{{.*}}.pcm",
+// CHECK-NEXT:    "A-{{.*}}.pcm",
 // CHECK-NEXT:    "-Xcc",
 // CHECK-NEXT:    "llvmcas://{{.*}}",
 // CHECK-NEXT:    "-Xcc",
 // CHECK-NEXT:    "-fmodule-file-cache-key",
 // CHECK-NEXT:    "-Xcc",
-// CHECK-NEXT:    "{{.*}}{{/|\\}}B-{{.*}}.pcm",
+// CHECK-NEXT:    "B-{{.*}}.pcm",
 // CHECK-NEXT:    "-Xcc",
 // CHECK-NEXT:    "llvmcas://{{.*}}"
 

test/CAS/debug_info_pcm.swift

@@ -16,8 +16,7 @@
 
 // RUN: dwarfdump --debug-info @%t/A.path | %FileCheck %s
 
-// CHECK: DW_AT_GNU_dwo_name
-// CHECK-SAME: TMP_DIR
+// CHECK: DW_AT_GNU_dwo_name ("llvmcas://{{.*}}")
 
 //--- test.swift
 import A

test/CAS/module_path_remap.swift

@@ -14,15 +14,15 @@
 // DEPS-FS: /^src/test/CAS/module_path_remap.swift
 
 // RUN: %{python} %S/Inputs/SwiftDepsExtractor.py %t/deps.json deps bridgingHeader | %FileCheck %s -check-prefix DEPS-BRIDGING
-// DEPS-BRIDGING: -fmodule-file=F=/^tmp/clang-module-cache/F-{{.*}}.pcm
+// DEPS-BRIDGING: -fmodule-file=F=F-{{.*}}.pcm
 
 // RUN: %{python} %S/Inputs/SwiftDepsExtractor.py %t/deps.json F casFSRootID > %t/F.fs.casid
 // RUN: %cache-tool -cas-path %t/cas -cache-tool-action print-include-tree-list @%t/F.fs.casid | %FileCheck %s -check-prefix F-FS
 // F-FS: /^src/test/CAS/../ScanDependencies/Inputs/Swift/F.swiftinterface
 
 // RUN: %{python} %S/Inputs/SwiftDepsExtractor.py %t/deps.json F commandLine | %FileCheck %s -check-prefix F-CMD
 // F-CMD: /^src/test/CAS/../ScanDependencies/Inputs/Swift/F.swiftinterface
-// F-CMD: -fmodule-file=SwiftShims=/^tmp/clang-module-cache/SwiftShims-{{.*}}.pcm
+// F-CMD: -fmodule-file=SwiftShims=SwiftShims-{{.*}}.pcm
 
 // RUN: %{python} %S/Inputs/SwiftDepsExtractor.py %t/deps.json clang:F clangIncludeTree > %t/tree.casid
 // RUN: clang-cas-test --cas %t/cas --print-include-tree @%t/tree.casid | %FileCheck %s -check-prefix TREE