[lldb] Remove unused code in GetVersion (NFC)

[kastiglione]

Summary

Small cleanup to lldb_private::GetVersion().

[kastiglione]

Unbreak code

[kastiglione]

switch NULL to ""

[kastiglione]

lldb/source/lldb.cpp

22

this won't expand to a string as is, does this indicate it's unused?

[teemperor]

LLDB_REVISION and LLDB_REPOSITORY are coming from VCSVersion.inc where it should be defined as a string. However the generation of that file seems to be broken since the monorepo migration. I put up a patch here that gets this working again: D88950

There is also the framework script that tries to define LLDB_REVISION but I assume that's only used for the headers we ship in the Framework? Not 100% sure what's going on with that.

Beside that, I think this code can really use some cleanup. I added some comments what else can be removed/updated.

lldb/source/lldb.cpp

20

This can return a string.

29

You can remove that comment too, it's from a time where there was special Darwin version code.

[kastiglione]

Restore repository handling

[kastiglione]

@teemperor I removed the comment and restored repository handling. It becomes much more of a useless diff :)

[kastiglione]

Update commit message

[teemperor]

Yeah there isn't a lot of unused code left here. If you want you can make a follow up replacing all the C-string logic with std::string (and removing the static local result var as that seems unnecessary).

lldb/source/lldb.cpp

 using namespace lldb_private;
 
 #include "clang/Basic/Version.h"
 
 #ifdef HAVE_VCS_VERSION_INC
 #include "VCSVersion.inc"
 #endif
 
 static const char *GetLLDBRevision() {
 #ifdef LLDB_REVISION
   return LLDB_REVISION;
 #else
-  return NULL;
+  return "";
 #endif
 }
 
-static const char *GetLLDBRepository() {
-#ifdef LLDB_REPOSITORY
-  return LLDB_REPOSITORY;
-#else
-  return NULL;
-#endif
-}
-
-#define QUOTE(str) #str
-#define EXPAND_AND_QUOTE(str) QUOTE(str)
-
 const char *lldb_private::GetVersion() {
   // On platforms other than Darwin, report a version number in the same style
   // as the clang tool.
   static std::string g_version_str;
   if (g_version_str.empty()) {
     g_version_str += "lldb version ";
     g_version_str += CLANG_VERSION_STRING;
 
-    const char *lldb_repo = GetLLDBRepository();
-    const char *lldb_rev = GetLLDBRevision();
-    if (lldb_repo || lldb_rev) {
-      g_version_str += " (";
-      if (lldb_repo)
-        g_version_str += lldb_repo;
-      if (lldb_repo && lldb_rev)
-        g_version_str += " ";
-      if (lldb_rev) {
-        g_version_str += "revision ";
-        g_version_str += lldb_rev;
-      }
-      g_version_str += ")";
+    std::string lldb_rev(GetLLDBRevision());
+    if (!lldb_rev.empty()) {
+      g_version_str += " (revision " + lldb_rev + ")";
     }
 
     std::string clang_rev(clang::getClangRevision());
     if (clang_rev.length() > 0) {
       g_version_str += "\n  clang revision ";
       g_version_str += clang_rev;
     }
     std::string llvm_rev(clang::getLLVMRevision());
     if (llvm_rev.length() > 0) {
       g_version_str += "\n  llvm revision ";
       g_version_str += llvm_rev;
     }
   }
   return g_version_str.c_str();
 }