[IncludeTree] Do not pass compilation directories

When using include-tree, all the relative paths references should be
turned into absolute path already. There is no need to pass options like
`-fdebug-compilation-dir` for debug info generation as it makes cache
hit less likely when two identical compilations where performed with
different compilation directories.

Author: cachemeifyoucan

clang/lib/CodeGen/CGDebugInfo.cpp

@@ -3332,6 +3332,10 @@ llvm::DIModule *CGDebugInfo::getOrCreateModuleRef(ASTSourceDescriptor Mod,
     std::string Remapped = remapDIPath(Path);
     StringRef Relative(Remapped);
     StringRef CompDir = TheCU->getDirectory();
+    // If compilation is not empty, return the path as it is.
+    if (CompDir.empty())
+      return Remapped;
+
     if (Relative.consume_front(CompDir))
       Relative.consume_front(llvm::sys::path::get_separator());
 

clang/lib/Tooling/DependencyScanning/ScanAndUpdateArgs.cpp

@@ -103,6 +103,9 @@ void tooling::dependencies::configureInvocationForCaching(
     // Clear APINotes options.
     CI.getAPINotesOpts().ModuleSearchPaths = {};
 
+    // Reset debug/coverage compilation dir as include-tree uses absolute path.
+    CodeGenOpts.DebugCompilationDir.clear();
+    CodeGenOpts.CoverageCompilationDir.clear();
     // Update output paths, and clear working directory.
     auto CWD = FileSystemOpts.WorkingDir;
     updateRelativePath(FrontendOpts.OutputFile, CWD);

clang/test/ClangScanDeps/include-tree-preserve-pch-path.c

@@ -1,5 +1,6 @@
 // REQUIRES: ondisk_cas
 
+// RUN: rm -rf %t
 // RUN: split-file %s %t
 // RUN: sed -e "s|DIR|%/t|g" %t/cdb_pch.json.template > %t/cdb_pch.json
 // RUN: sed -e "s|DIR|%/t|g" %t/cdb.json.template > %t/cdb.json
@@ -10,9 +11,10 @@
 
 // CHECK: "-fmodule-format=obj"
 // CHECK: "-dwarf-ext-refs"
+// CHECK-NOT: -fdebug-compilation-dir
 
 // RUN: %deps-to-rsp %t/deps_pch.json --tu-index 0 > %t/pch.rsp
-// RUN: %clang @%t/pch.rsp
+// RUN: %clang @%t/pch.rsp -Rcompile-job-cache
 
 // RUN: clang-scan-deps -compilation-database %t/cdb.json -format experimental-include-tree-full -cas-path %t/cas > %t/deps_tu.json
 // RUN: FileCheck %s -input-file %t/deps_tu.json -DPREFIX=%/t
@@ -21,7 +23,9 @@
 // RUN: %clang @%t/tu.rsp
 
 // RUN: cat %t/tu.ll | FileCheck %s -check-prefix=LLVMIR -DPREFIX=%/t
-// LLVMIR: !DICompileUnit({{.*}}, splitDebugFilename: "prefix.pch"
+// LLVMIR: !DIFile(filename: "[[PREFIX]]/tu.c", directory: "")
+// LLVMIR: !DICompileUnit({{.*}}, splitDebugFilename: "[[PREFIX]]/prefix.pch"
+// LLVMIR: !DIFile(filename: "prefix.h", directory: "")
 
 // Extract include-tree casid
 // RUN: cat %t/tu.rsp | sed -E 's|.*"-fcas-include-tree" "(llvmcas://[[:xdigit:]]+)".*|\1|' > %t/tu.casid