From ff5948bf6f871141d8d14957e4bf088851f2434e Mon Sep 17 00:00:00 2001 From: George Rimar Date: Wed, 19 Dec 2018 10:29:35 +0000 Subject: [llvm-objdump] - Fix BB. Move the helper method before the first incocation in the file. llvm-svn: 349614 --- llvm/tools/llvm-objdump/llvm-objdump.cpp | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp') diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index cca0dbcd4ff..503ef7fe97d 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/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 static std::error_code getRelocationValueString(const ELFObjectFile *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"); -- cgit v1.2.3