From 4531f5385125dd6448004a16cd80a94484ca68b7 Mon Sep 17 00:00:00 2001
From: Zhang Qing Shan <zhangqingshan.zll@bytedance.com>
Date: Sat, 10 Sep 2022 08:05:20 +0800
Subject: [PATCH] [llvm-dwp] Get the DWO file from relative path if the
 absolute path is not valid

Extend the llvm-dwp to support searching the DWOs that from relative path for the
case that build from remote building system(different comp_dir).

Reviewd By: dblaikie

Differential Revision: https://reviews.llvm.org/D133480
---
 llvm/test/tools/llvm-dwp/Inputs/search_dwos/a.dwo | Bin 0 -> 840 bytes
 llvm/test/tools/llvm-dwp/Inputs/search_dwos/b.dwo | Bin 0 -> 768 bytes
 llvm/test/tools/llvm-dwp/Inputs/search_dwos/main  | Bin 0 -> 7464 bytes
 llvm/test/tools/llvm-dwp/X86/search_dwos.test     |  22 ++++++++++++++++++++++
 llvm/tools/llvm-dwp/llvm-dwp.cpp                  |   5 ++++-
 5 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 llvm/test/tools/llvm-dwp/Inputs/search_dwos/a.dwo
 create mode 100644 llvm/test/tools/llvm-dwp/Inputs/search_dwos/b.dwo
 create mode 100755 llvm/test/tools/llvm-dwp/Inputs/search_dwos/main
 create mode 100644 llvm/test/tools/llvm-dwp/X86/search_dwos.test

diff --git a/llvm/test/tools/llvm-dwp/Inputs/search_dwos/a.dwo b/llvm/test/tools/llvm-dwp/Inputs/search_dwos/a.dwo
new file mode 100644
index 0000000000000000000000000000000000000000..56c6f413691b1b9c26a57b823a156889c68b25f0
GIT binary patch
literal 840
zcmbu7%}T>S5XWbmv<g9__M+e+qJke78#VO{Vh|LB3VQM2rEHQ-iL^;cV#Sj+C-ETo
zCi)hh1m8k@3MX-6m*UNZ|Ln|f{yXfF+#NNKON2nN2$(Re3JUNhKr6=<RM6SF)M+0m
zbg3VJA0*IhUYu%S)K;Ai4ccm-MX?_Ss;+BwO;?xNequSH%QX8oVQyyJi*MugPN&~p
z>qX%ea}o_b>Q0?C4Bc&PyY{B%7#?E|-PzdGb%P;e25q=?+R*7TP|fM}FuFHkey<9~
zanuB=ib_!rC<7&<uuJ4QC|8;vpO350FIEX30zfW+5F(MuJTDPx3lmu?%Rs7RF*R#t
zDK%dXQ}gw344|Yz_1>JSSkpmjVq;I)R}N+Xq+ibANiD<j0$^<_ih@HybD4eJZc*Eg
zSU<lvCvg(BLeGm?5|3c9^aC&asnMTMI~)1$b%GP5Kc>X|yPuErgx?|WtYFMo9bk|H
z9xT2;i4gPRe6iPtY#>_Sc`++O%!_jc-W{?*!Lt2}7g=9iqvx}lvw`TF=kQE~L+>yB
E22s#xh5!Hn

literal 0
HcmV?d00001

diff --git a/llvm/test/tools/llvm-dwp/Inputs/search_dwos/b.dwo b/llvm/test/tools/llvm-dwp/Inputs/search_dwos/b.dwo
new file mode 100644
index 0000000000000000000000000000000000000000..c72acbdcfb41a061f015f91b2d5362650dd64240
GIT binary patch
literal 768
zcmbu6Jxjwt7{~9@T7^!v4mt=?P*m)hSQ2Z67z!1HI=FOjDY@hlDm5udj1+{%fZxVJ
zcUM1zU&K|P#DpHf&4cIV|9f6?;pY9pg@7?C4n`VUsDdICb5PH)j%v_3x{+ywC>jig
zSH$xj(VQ5rBSy>*#-1z6GLeWZ?m6R7H$96HIt!VVHg<zqa5R}jcde=K-7+&I&?9yv
zrYf?fo>;VPn~KetX>^X;vaB#*OfghTGE~{vN0gY;DR}F_%dS%czXCP`n}cnGRl$H_
zVGC8N?^l~n|K;mZfO{i^hX})O;|AVIwB}MJ(O!Fr_SRcQNFb>3q^;KUbvMzV(5;`<
z&o|Od#A5W`85xxNEXux|lOXg*o^1y#3`&@nW7qb6HS~uDO;`T+T*89NA4?AN_qs0C
zxM$2N2jEjC!4qd7cX}S5c?fwiU&Q8u#eC~WF4lMmc`;Yu(*=tQmd4Lq?D7!u@_edu
P7W1v&xoGha^78x-s&-$1

literal 0
HcmV?d00001

diff --git a/llvm/test/tools/llvm-dwp/Inputs/search_dwos/main b/llvm/test/tools/llvm-dwp/Inputs/search_dwos/main
new file mode 100755
index 0000000000000000000000000000000000000000..f39d615bc24b133b03d3216d41724dcb4d151a5c
GIT binary patch
literal 7464
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

literal 0
HcmV?d00001

diff --git a/llvm/test/tools/llvm-dwp/X86/search_dwos.test b/llvm/test/tools/llvm-dwp/X86/search_dwos.test
new file mode 100644
index 0000000..bf45bba
--- /dev/null
+++ b/llvm/test/tools/llvm-dwp/X86/search_dwos.test
@@ -0,0 +1,22 @@
+RUN: rm -rf %t
+RUN: mkdir %t
+RUN: cd %t
+RUN: cp %p/../Inputs/search_dwos/a.dwo a.dwo
+RUN: cp %p/../Inputs/search_dwos/b.dwo b.dwo
+RUN: cp %p/../Inputs/search_dwos/main main
+RUN: llvm-dwp -e main -o %t.dwp 
+
+Search the DWO from relative path if absolute path is not valid.
+Build commands for the test binaries:
+
+clang++ -Xclang -fdebug-compilation-dir -Xclang "path-not-exists" -g -O0 -gsplit-dwarf a.cpp b.cpp -o main
+
+sources:
+a.cpp:
+  void a() {}
+
+b.cpp:
+  void b() {}
+  int main() {
+     return 0;
+  }
diff --git a/llvm/tools/llvm-dwp/llvm-dwp.cpp b/llvm/tools/llvm-dwp/llvm-dwp.cpp
index 7d1dd61..f9d1dc4 100644
--- a/llvm/tools/llvm-dwp/llvm-dwp.cpp
+++ b/llvm/tools/llvm-dwp/llvm-dwp.cpp
@@ -71,7 +71,10 @@ getDWOFilenames(StringRef ExecFilename) {
     if (!DWOCompDir.empty()) {
       SmallString<16> DWOPath(std::move(DWOName));
       sys::fs::make_absolute(DWOCompDir, DWOPath);
-      DWOPaths.emplace_back(DWOPath.data(), DWOPath.size());
+      if (!sys::fs::exists(DWOPath) && sys::fs::exists(DWOName))
+        DWOPaths.push_back(std::move(DWOName));
+      else
+        DWOPaths.emplace_back(DWOPath.data(), DWOPath.size());
     } else {
       DWOPaths.push_back(std::move(DWOName));
     }
-- 
2.7.4