Merge pull request #81753 from rastogishubham/CompDir6.2

[6.2] Set the Compilation directory when generating the Skeleton CU

Author: rastogishubham

lib/IRGen/IRGenDebugInfo.cpp

@@ -847,6 +847,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
 
   llvm::DIModule *getOrCreateModule(const void *Key, llvm::DIScope *Parent,
                                     StringRef Name, StringRef IncludePath,
+                                    StringRef CompDir,
                                     uint64_t Signature = ~1ULL,
                                     StringRef ASTFile = StringRef()) {
     // Look in the cache first.
@@ -856,6 +857,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
 
     std::string RemappedIncludePath = DebugPrefixMap.remapPath(IncludePath);
     std::string RemappedASTFile = DebugPrefixMap.remapPath(ASTFile);
+    std::string RemappedCompDir = DebugPrefixMap.remapPath(CompDir);
 
     // For Clang modules / PCH, create a Skeleton CU pointing to the PCM/PCH.
     if (!Opts.DisableClangModuleSkeletonCUs) {
@@ -865,7 +867,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
         llvm::DIBuilder DIB(M);
         DIB.createCompileUnit(IGM.ObjCInterop ? llvm::dwarf::DW_LANG_ObjC
                                               : llvm::dwarf::DW_LANG_C99,
-                              DIB.createFile(Name, RemappedIncludePath),
+                              DIB.createFile(Name, RemappedCompDir),
                               TheCU->getProducer(), true, StringRef(), 0,
                               RemappedASTFile, llvm::DICompileUnit::FullDebug,
                               Signature);
@@ -892,12 +894,8 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
     uint64_t Signature =
       Desc.getSignature() ? Desc.getSignature().truncatedValue() : ~1ULL;
 
-    // Clang modules using fmodule-file-home-is-cwd should have their
-    // include path set to the working directory.
-    auto &HSI =
-        CI.getClangPreprocessor().getHeaderSearchInfo().getHeaderSearchOpts();
-    StringRef IncludePath =
-        HSI.ModuleFileHomeIsCwd ? Opts.DebugCompilationDir : Desc.getPath();
+    StringRef CompDir = Opts.DebugCompilationDir;
+    StringRef IncludePath = Desc.getPath();
 
     // Handle Clang modules.
     if (ClangModule) {
@@ -919,12 +917,13 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
                                    ClangModule->Parent);
       }
       return getOrCreateModule(ClangModule, Parent, Desc.getModuleName(),
-                               IncludePath, Signature, Desc.getASTFile());
+                               IncludePath, CompDir, Signature,
+                               Desc.getASTFile());
     }
     // Handle PCH.
     return getOrCreateModule(Desc.getASTFile().bytes_begin(), nullptr,
-                             Desc.getModuleName(), IncludePath, Signature,
-                             Desc.getASTFile());
+                             Desc.getModuleName(), IncludePath, CompDir,
+                             Signature, Desc.getASTFile());
   };
 
   static std::optional<ASTSourceDescriptor>
@@ -947,7 +946,7 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
     // the module on disk is Bar (.swiftmodule or .swiftinterface), and is used
     // for loading and mangling.
     StringRef Name = M->getRealName().str();
-    return getOrCreateModule(M, TheCU, Name, Path);
+    return getOrCreateModule(M, TheCU, Name, Path, Opts.DebugCompilationDir);
   }
 
   TypeAliasDecl *getMetadataType(StringRef ArchetypeName) {
@@ -2543,8 +2542,8 @@ class IRGenDebugInfoImpl : public IRGenDebugInfo {
         auto Identifier = IGM.getSILModule().getASTContext().getIdentifier(
             Attribute->ManglingModuleName);
         void *Key = (void *)Identifier.get();
-        Scope =
-            getOrCreateModule(Key, TheCU, Attribute->ManglingModuleName, {});
+        Scope = getOrCreateModule(Key, TheCU, Attribute->ManglingModuleName, {},
+                                  {});
       } else {
         Context = ND->getParent();
       }
@@ -2791,7 +2790,8 @@ IRGenDebugInfoImpl::IRGenDebugInfoImpl(const IRGenOptions &Opts,
   // Create a module for the current compile unit.
   auto *MDecl = IGM.getSwiftModule();
   llvm::sys::path::remove_filename(SourcePath);
-  MainModule = getOrCreateModule(MDecl, TheCU, Opts.ModuleName, SourcePath);
+  MainModule = getOrCreateModule(MDecl, TheCU, Opts.ModuleName, SourcePath,
+                                 Opts.DebugCompilationDir);
   DBuilder.createImportedModule(MainFile, MainModule, MainFile, 0);
 
   // Macro definitions that were defined by the user with "-Xcc -D" on the

test/DebugInfo/comp-dir.swift

@@ -0,0 +1,11 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module-path %t/Globals.swiftmodule %S/Globals.swift
+// RUN: %target-swift-frontend -c -I %t -primary-file %s -g -parse-as-library -emit-module -emit-object -module-cache-path "./mc" -file-compilation-dir "." -debug-prefix-map "$(pwd)=." -o %t/test.o
+// RUN: %llvm-dwarfdump %t/test.o | %FileCheck %s
+
+// CHECK: DW_TAG_compile_unit
+
+// CHECK: DW_TAG_compile_unit
+// CHECK-NOT: NULL
+// CHECK: DW_AT_comp_dir	(".")
+// CHECK-NOT: NULL