[PATCH] D138334: Improve llvm-symbolizer search logic for symlink

[jeffrey tan via Phabricator via llvm-commits]

yinghuitan updated this revision to Diff 477016.
yinghuitan added a comment.

Address review comment


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D138334/new/

https://reviews.llvm.org/D138334

Files:
  llvm/lib/Support/Signals.cpp


Index: llvm/lib/Support/Signals.cpp
===================================================================
--- llvm/lib/Support/Signals.cpp
+++ llvm/lib/Support/Signals.cpp
@@ -157,7 +157,20 @@
   } else if (!Argv0.empty()) {
     StringRef Parent = llvm::sys::path::parent_path(Argv0);
     if (!Parent.empty())
-      LLVMSymbolizerPathOrErr = sys::findProgramByName("llvm-symbolizer", Parent);
+      LLVMSymbolizerPathOrErr =
+          sys::findProgramByName("llvm-symbolizer", Parent);
+
+    // If we fail to find llvm-symbolizer and Argv0 is symlink we should resolve
+    // the symlink and retry real path's parent directory.
+    if (!LLVMSymbolizerPathOrErr && llvm::sys::fs::is_symlink_file(Argv0)) {
+      llvm::SmallString<128> Resolved;
+      if (!llvm::sys::fs::real_path(Argv0, Resolved)) {
+        Parent = llvm::sys::path::parent_path(Resolved);
+        if (!Parent.empty())
+          LLVMSymbolizerPathOrErr =
+              sys::findProgramByName("llvm-symbolizer", Parent);
+      }
+    }
   }
   if (!LLVMSymbolizerPathOrErr)
     LLVMSymbolizerPathOrErr = sys::findProgramByName("llvm-symbolizer");


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D138334.477016.patch
Type: text/x-patch
Size: 1127 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20221121/7acc8807/attachment.bin>