[PATCH] D60730: Only use argv[0] as the main executable name if it exists.

[Sean Silva via Phabricator via llvm-commits]

silvas created this revision.
silvas added a reviewer: rsmith.
Herald added a reviewer: jfb.
Herald added subscribers: llvm-commits, kristina.
Herald added a project: LLVM.

  Under some environments, argv[0] doesn't hold a valid file name, but
  sys::fs::getMainExecutable will find the main executable properly.
  
  This patch tweaks the logic to fall back to sys::fs::getMainExecutable
  in more situations.


Repository:
  rL LLVM

https://reviews.llvm.org/D60730

Files:
  lib/Support/Signals.cpp


Index: lib/Support/Signals.cpp
===================================================================
--- lib/Support/Signals.cpp
+++ lib/Support/Signals.cpp
@@ -131,8 +131,8 @@
   // If we don't know argv0 or the address of main() at this point, try
   // to guess it anyway (it's possible on some platforms).
   std::string MainExecutableName =
-      Argv0.empty() ? sys::fs::getMainExecutable(nullptr, nullptr)
-                    : (std::string)Argv0;
+      sys::fs::exists(Argv0) ? (std::string)Argv0
+                             : sys::fs::getMainExecutable(nullptr, nullptr);
   BumpPtrAllocator Allocator;
   StringSaver StrPool(Allocator);
   std::vector<const char *> Modules(Depth, nullptr);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D60730.195242.patch
Type: text/x-patch
Size: 704 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190415/55e19b20/attachment.bin>