From: George Rimar <grimar@accesssoftek.com>
Date: Wed, 19 Dec 2018 10:29:35 +0000 (+0000)
Subject: [llvm-objdump] - Fix BB.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=927407d000ed9af725378562b9cd8afbc763b290;p=llvm

[llvm-objdump] - Fix BB.

Move the helper method before the first incocation in the file.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@349614 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp
index cca0dbcd4ff..503ef7fe97d 100644
--- a/tools/llvm-objdump/llvm-objdump.cpp
+++ b/tools/llvm-objdump/llvm-objdump.cpp
@@ -456,6 +456,21 @@ bool llvm::RelocAddressLess(RelocationRef a, RelocationRef b) {
   return a.getOffset() < b.getOffset();
 }
 
+static std::string demangle(StringRef Name) {
+  char *Demangled = nullptr;
+  if (Name.startswith("_Z"))
+    Demangled = itaniumDemangle(Name.data(), Demangled, nullptr, nullptr);
+  else if (Name.startswith("?"))
+    Demangled = microsoftDemangle(Name.data(), Demangled, nullptr, nullptr);
+
+  if (!Demangled)
+    return Name;
+
+  std::string Ret = Demangled;
+  free(Demangled);
+  return Ret;
+}
+
 template <class ELFT>
 static std::error_code getRelocationValueString(const ELFObjectFile<ELFT> *Obj,
                                                 const RelocationRef &RelRef,
@@ -1280,22 +1295,6 @@ static void addPltEntries(const ObjectFile *Obj,
   }
 }
 
-static std::string demangle(StringRef Name) {
-  char *Demangled = nullptr;
-  size_t Size = 0;
-  if (Name.startswith("_Z"))
-    Demangled = itaniumDemangle(Name.data(), Demangled, &Size, nullptr);
-  else if (Name.startswith("?"))
-    Demangled = microsoftDemangle(Name.data(), Demangled, &Size, nullptr);
-
-  if (!Demangled)
-    return Name;
-
-  std::string Ret = Demangled;
-  free(Demangled);
-  return Ret;
-}
-
 static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
   if (StartAddress > StopAddress)
     error("Start address should be less than stop address");