[clang][cas] Prefix map -fdepfile-entry

For rdar://106307646

Author: benlangmuir

clang/lib/Tooling/DependencyScanning/ScanAndUpdateArgs.cpp

@@ -177,6 +177,14 @@ void DepscanPrefixMapping::remapInvocationPaths(CompilerInvocation &Invocation,
   Mapper.mapInPlace(CodeGenOpts.ProfileInstrumentUsePath);
   Mapper.mapInPlace(CodeGenOpts.SampleProfileFile);
   Mapper.mapInPlace(CodeGenOpts.ProfileRemappingFile);
+
+  // Dependency output options.
+  // Note: these are not in the cache key, but they are in the module context
+  // hash, which indirectly impacts the cache key when importing a module.
+  // In the future we may change how -fmodule-file-cache-key works when
+  // remapping to avoid needing this.
+  for (auto &ExtraDep : Invocation.getDependencyOutputOpts().ExtraDeps)
+    Mapper.mapInPlace(ExtraDep.first);
 }
 
 void DepscanPrefixMapping::configurePrefixMapper(const CompilerInvocation &CI,

clang/test/CAS/depscan-prefix-map.c

@@ -16,6 +16,7 @@
 // RUN:              -fdepscan-prefix-map=%{objroot}=/^objroot            \
 // RUN:              -fdepscan-prefix-map=%S/Inputs/toolchain_dir=/^toolchain \
 // RUN:              -fdepscan-prefix-map=%S/Inputs/SDK=/^sdk             \
+// RUN:              -fdepfile-entry=%t.d/extra                           \
 // RUN: | FileCheck %s -DPREFIX=%t.d
 // RUN: %clang -cc1depscan -dump-depscan-tree=%t.root -fdepscan=inline    \
 // RUN:    -cc1-args -triple x86_64-apple-macos11.0 -x c %s -o %t.d/out.o \
@@ -29,6 +30,7 @@
 // RUN:              -fdepscan-prefix-map=%{objroot}=/^objroot            \
 // RUN:              -fdepscan-prefix-map=%S/Inputs/toolchain_dir=/^toolchain \
 // RUN:              -fdepscan-prefix-map=%S/Inputs/SDK=/^sdk             \
+// RUN:              -fdepfile-entry=%t.d/extra                           \
 // RUN: | FileCheck %s -DPREFIX=%t.d
 // RUN: %clang -cc1depscand -execute %{clang-daemon-dir}/%basename_t      \
 // RUN:   -cas-args -fcas-path %t.d/cas --                                \
@@ -45,12 +47,14 @@
 // RUN:              -fdepscan-prefix-map=%{objroot}=/^objroot            \
 // RUN:              -fdepscan-prefix-map=%S/Inputs/toolchain_dir=/^toolchain \
 // RUN:              -fdepscan-prefix-map=%S/Inputs/SDK=/^sdk             \
+// RUN:              -fdepfile-entry=%t.d/extra                           \
 // RUN: | FileCheck %s -DPREFIX=%t.d
 //
 // CHECK:      "-fcas-path" "[[PREFIX]]/cas"
 // CHECK-SAME: "-working-directory" "/^testdir"
 // CHECK-SAME: "-x" "c" "/^source/depscan-prefix-map.c"
 // CHECK-SAME: "-isysroot" "/^sdk"
+// CHECK-SAME: "-fdepfile-entry=/^testdir/extra"
 
 // RUN: llvm-cas --cas %t.d/cas --ls-tree-recursive @%t.root              \
 // RUN: | FileCheck %s -check-prefix=CHECK-ROOT