[llvm] r349614 - [llvm-objdump] - Fix BB.

[George Rimar via llvm-commits]

Author: grimar
Date: Wed Dec 19 02:29:35 2018
New Revision: 349614

URL: http://llvm.org/viewvc/llvm-project?rev=349614&view=rev
Log:
[llvm-objdump] - Fix BB.

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

Modified:
    llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp

Modified: llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp?rev=349614&r1=349613&r2=349614&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/llvm-objdump.cpp Wed Dec 19 02:29:35 2018
@@ -456,6 +456,21 @@ bool llvm::RelocAddressLess(RelocationRe
   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 ObjectFi
   }
 }
 
-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");