<html><head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">Sorry! I screwed up during rebasing and accidentally git-added a file from a different patch which I then removed when I re-landed the patch.<div class=""><br class=""></div><div class="">-- adrian<br class=""><div><br class=""><blockquote type="cite" class=""><div class="">On Mar 22, 2020, at 5:16 PM, David Blaikie <<a href="mailto:dblaikie@gmail.com" class="">dblaikie@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Please describe in the commit message why a patch is being reverted.</div><br class=""><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Mar 20, 2020 at 4:28 PM Adrian Prantl via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="">llvm-commits@lists.llvm.org</a>> wrote:<br class=""></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br class="">
Author: Adrian Prantl<br class="">
Date: 2020-03-20T16:27:23-07:00<br class="">
New Revision: bde15de3cabff6363008e67a999e6e4559743867<br class="">
<br class="">
URL: <a href="https://github.com/llvm/llvm-project/commit/bde15de3cabff6363008e67a999e6e4559743867" rel="noreferrer" target="_blank" class="">https://github.com/llvm/llvm-project/commit/bde15de3cabff6363008e67a999e6e4559743867</a><br class="">
DIFF: <a href="https://github.com/llvm/llvm-project/commit/bde15de3cabff6363008e67a999e6e4559743867.diff" rel="noreferrer" target="_blank" class="">https://github.com/llvm/llvm-project/commit/bde15de3cabff6363008e67a999e6e4559743867.diff</a><br class="">
<br class="">
LOG: Revert "Allow remapping the sysroot with -fdebug-prefix-map."<br class="">
<br class="">
This reverts commit 6725c4836a5b3c11227869a6f456019a244aa29f.<br class="">
<br class="">
Added: <br class="">
<br class="">
<br class="">
Modified: <br class="">
clang/lib/CodeGen/CGDebugInfo.cpp<br class="">
clang/test/CodeGen/debug-prefix-map.c<br class="">
llvm/lib/DWARFLinker/DWARFLinker.cpp<br class="">
<br class="">
Removed: <br class="">
<br class="">
<br class="">
<br class="">
################################################################################<br class="">
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp<br class="">
index da6cb458982b..a98d82f7152c 100644<br class="">
--- a/clang/lib/CodeGen/CGDebugInfo.cpp<br class="">
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp<br class="">
@@ -631,7 +631,7 @@ void CGDebugInfo::CreateCompileUnit() {<br class="">
? llvm::DICompileUnit::DebugNameTableKind::None<br class="">
: static_cast<llvm::DICompileUnit::DebugNameTableKind>(<br class="">
CGOpts.DebugNameTable),<br class="">
- CGOpts.DebugRangesBaseAddress, remapDIPath(Sysroot), SDK);<br class="">
+ CGOpts.DebugRangesBaseAddress, Sysroot, SDK);<br class="">
}<br class="">
<br class="">
llvm::DIType *CGDebugInfo::CreateType(const BuiltinType *BT) {<br class="">
<br class="">
diff --git a/clang/test/CodeGen/debug-prefix-map.c b/clang/test/CodeGen/debug-prefix-map.c<br class="">
index 354110d1b0da..5366e19447ae 100644<br class="">
--- a/clang/test/CodeGen/debug-prefix-map.c<br class="">
+++ b/clang/test/CodeGen/debug-prefix-map.c<br class="">
@@ -2,7 +2,6 @@<br class="">
// RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%p=/UNLIKELY_PATH=empty %s -emit-llvm -o - | FileCheck %s -check-prefix CHECK-EVIL<br class="">
// RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%p=/UNLIKELY_PATH/empty %s -emit-llvm -o - -main-file-name debug-prefix-map.c | FileCheck %s<br class="">
// RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%p=/UNLIKELY_PATH/empty %s -emit-llvm -o - -fdebug-compilation-dir %p | FileCheck %s -check-prefix CHECK-COMPILATION-DIR<br class="">
-// RUN: %clang_cc1 -debug-info-kind=standalone -fdebug-prefix-map=%p=/UNLIKELY_PATH/empty %s -emit-llvm -o - -isysroot %p -debugger-tuning=lldb | FileCheck %s -check-prefix CHECK-SYSROOT<br class="">
// RUN: %clang -g -fdebug-prefix-map=%p=/UNLIKELY_PATH/empty -S -c %s -emit-llvm -o - | FileCheck %s<br class="">
// RUN: %clang -g -ffile-prefix-map=%p=/UNLIKELY_PATH/empty -S -c %s -emit-llvm -o - | FileCheck %s<br class="">
<br class="">
@@ -41,4 +40,3 @@ void test_rewrite_includes() {<br class="">
// CHECK-COMPILATION-DIR: !DIFile(filename: "{{.*}}", directory: "/UNLIKELY_PATH/empty")<br class="">
// CHECK-COMPILATION-DIR: !DIFile(filename: "{{.*}}Inputs/stdio.h", directory: "/UNLIKELY_PATH/empty")<br class="">
// CHECK-COMPILATION-DIR-NOT: !DIFile(filename:<br class="">
-// CHECK-SYSROOT: !DICompileUnit({{.*}}sysroot: "/UNLIKELY_PATH/empty"<br class="">
<br class="">
diff --git a/llvm/lib/DWARFLinker/DWARFLinker.cpp b/llvm/lib/DWARFLinker/DWARFLinker.cpp<br class="">
index fbc3a3e60cc9..8464c04f801e 100644<br class="">
--- a/llvm/lib/DWARFLinker/DWARFLinker.cpp<br class="">
+++ b/llvm/lib/DWARFLinker/DWARFLinker.cpp<br class="">
@@ -1914,15 +1914,6 @@ static uint64_t getDwoId(const DWARFDie &CUDie, const DWARFUnit &Unit) {<br class="">
return 0;<br class="">
}<br class="">
<br class="">
-static std::string remapPath(std::string Path,<br class="">
- const objectPrefixMap &ObjectPrefixMap) {<br class="">
- StringRef PathRef(Path);<br class="">
- for (const auto &Entry : ObjectPrefixMap)<br class="">
- if (PathRef.startswith(Entry.first))<br class="">
- return (Twine(Entry.second) + PathRef.substr(Entry.first.size())).str();<br class="">
- return Path;<br class="">
-}<br class="">
-<br class="">
bool DWARFLinker::registerModuleReference(<br class="">
DWARFDie CUDie, const DWARFUnit &Unit, const DwarfFile &File,<br class="">
OffsetsStringPool &StringPool, UniquingStringPool &UniquingStringPool,<br class="">
<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
llvm-commits mailing list<br class="">
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank" class="">llvm-commits@lists.llvm.org</a><br class="">
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank" class="">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="">
</blockquote></div>
</div></blockquote></div><br class=""></div></body></html>