commit 43580a5c5afc3cd935e4e3d67f285fe81dd7e8c5
author Adrian Prantl <aprantl@apple.com> Wed Mar 18 13:15:14 2020 -0700
committer Adrian Prantl <aprantl@apple.com> Fri Mar 20 15:15:56 2020 -0700
tree 6bc99673629353840135b30b519436f87675fa48
parent df4cc35efd0aab3612072ce451b8abfda2b7d39b

Allow remapping Clang module skeleton CU references with -fdebug-prefix-map

Differential Revision: https://reviews.llvm.org/D76383

clang/lib/CodeGen/CGDebugInfo.cpp

diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index 9645dd1..a98d82f 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -2493,14 +2493,18 @@
             : ~1ULL;
     llvm::DIBuilder DIB(CGM.getModule());
     SmallString<0> PCM;
-    if (!llvm::sys::path::is_absolute(PCM))
+    if (!llvm::sys::path::is_absolute(Mod.getASTFile()))
       PCM = Mod.getPath();
     llvm::sys::path::append(PCM, Mod.getASTFile());
-    StringRef CompDir = getCurrentDirname();
+    std::string RemappedPCM = remapDIPath(PCM);
+    StringRef RelativePCM(RemappedPCM);
+    StringRef CompDir = TheCU->getDirectory();
+    if (RelativePCM.consume_front(CompDir))
+      RelativePCM.consume_front(llvm::sys::path::get_separator());
     DIB.createCompileUnit(TheCU->getSourceLanguage(),
                           // TODO: Support "Source" from external AST providers?
                           DIB.createFile(Mod.getModuleName(), CompDir),
-                          TheCU->getProducer(), false, StringRef(), 0, PCM,
+                          TheCU->getProducer(), false, StringRef(), 0, RelativePCM,
                           llvm::DICompileUnit::FullDebug, Signature);
     DIB.finalize();
   }