Removed GetProgramFileSpec

Author: DhruvSrivastavaX

lldb/include/lldb/Host/linux/HostInfoLinux.h

@@ -26,6 +26,7 @@ class HostInfoLinux : public HostInfoPosix {
   static void Terminate();
 
   static llvm::StringRef GetDistributionId();
+  static FileSpec GetProgramFileSpec();
 
 protected:
   static void ComputeHostArchitectureSupport(ArchSpec &arch_32,

lldb/include/lldb/Host/posix/HostInfoPosix.h

@@ -32,7 +32,6 @@ class HostInfoPosix : public HostInfoBase {
   static uint32_t GetEffectiveGroupID();
 
   static FileSpec GetDefaultShell();
-  static FileSpec GetProgramFileSpec();
 
   static bool GetEnvironmentVar(const std::string &var_name, std::string &var);
 

lldb/source/Host/linux/HostInfoLinux.cpp

@@ -30,8 +30,6 @@ namespace {
 struct HostInfoLinuxFields {
   llvm::once_flag m_distribution_once_flag;
   std::string m_distribution_id;
-  // llvm::once_flag m_os_version_once_flag;
-  // llvm::VersionTuple m_os_version;
 };
 } // namespace
 
@@ -50,23 +48,6 @@ void HostInfoLinux::Terminate() {
   HostInfoBase::Terminate();
 }
 
-/*llvm::VersionTuple HostInfoPosix::GetOSVersion() {
-  assert(g_fields && "Missing call to Initialize?");
-  llvm::call_once(g_fields->m_os_version_once_flag, []() {
-    struct utsname un;
-    if (uname(&un) != 0)
-      return;
-
-    llvm::StringRef release = un.release;
-    // The kernel release string can include a lot of stuff (e.g.
-    // 4.9.0-6-amd64). We're only interested in the numbered prefix.
-    release = release.substr(0, release.find_first_not_of("0123456789."));
-    g_fields->m_os_version.tryParse(release);
-  });
-
-  return g_fields->m_os_version;
-}
-*/
 llvm::StringRef HostInfoLinux::GetDistributionId() {
   assert(g_fields && "Missing call to Initialize?");
   // Try to run 'lbs_release -i', and use that response for the distribution
@@ -142,6 +123,21 @@ llvm::StringRef HostInfoLinux::GetDistributionId() {
   return g_fields->m_distribution_id;
 }
 
+FileSpec HostInfoLinux::GetProgramFileSpec() {
+  static FileSpec g_program_filespec;
+
+  if (!g_program_filespec) {
+    char exe_path[PATH_MAX];
+    ssize_t len = readlink("/proc/self/exe", exe_path, sizeof(exe_path) - 1);
+    if (len > 0) {
+      exe_path[len] = 0;
+      g_program_filespec.SetFile(exe_path, FileSpec::Style::native);
+    }
+  }
+
+  return g_program_filespec;
+}
+
 void HostInfoLinux::ComputeHostArchitectureSupport(ArchSpec &arch_32,
                                                    ArchSpec &arch_64) {
   HostInfoPosix::ComputeHostArchitectureSupport(arch_32, arch_64);

lldb/source/Host/posix/HostInfoPosix.cpp

@@ -9,6 +9,7 @@
 #include "lldb/Host/posix/HostInfoPosix.h"
 #include "lldb/Host/Config.h"
 #include "lldb/Host/FileSystem.h"
+#include "lldb/Host/HostInfo.h"
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/UserIDResolver.h"
 #include "llvm/ADT/SmallString.h"
@@ -46,7 +47,7 @@ llvm::VersionTuple HostInfoPosix::GetOSVersion() {
       return;
 
     llvm::StringRef release = un.release;
-    // The kernel release string can include a lot of stuff (e.g.
+    // The Linux kernel release string can include a lot of stuff (e.g.
     // 4.9.0-6-amd64). We're only interested in the numbered prefix.
     release = release.substr(0, release.find_first_not_of("0123456789."));
     g_fields->m_os_version.tryParse(release);
@@ -177,21 +178,6 @@ FileSpec HostInfoPosix::GetDefaultShell() {
   return FileSpec("/bin/sh");
 }
 
-FileSpec HostInfoPosix::GetProgramFileSpec() {
-  static FileSpec g_program_filespec;
-
-  if (!g_program_filespec) {
-    char exe_path[PATH_MAX];
-    ssize_t len = readlink("/proc/self/exe", exe_path, sizeof(exe_path) - 1);
-    if (len > 0) {
-      exe_path[len] = 0;
-      g_program_filespec.SetFile(exe_path, FileSpec::Style::native);
-    }
-  }
-
-  return g_program_filespec;
-}
-
 // Keeping the original one for reference
 // bool HostInfoPosix::ComputeSupportExeDirectory(FileSpec &file_spec) {
 //  return ComputePathRelativeToLibrary(file_spec, "/bin");
@@ -201,7 +187,7 @@ bool HostInfoPosix::ComputeSupportExeDirectory(FileSpec &file_spec) {
   if (ComputePathRelativeToLibrary(file_spec, "/bin") &&
       file_spec.IsAbsolute() && FileSystem::Instance().Exists(file_spec))
     return true;
-  file_spec.SetDirectory(GetProgramFileSpec().GetDirectory());
+  file_spec.SetDirectory(HostInfo::GetProgramFileSpec().GetDirectory());
   return !file_spec.GetDirectory().IsEmpty();
 }