From 178dbd44187e23e7e3f3ba17b00c89c819070296 Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Thu, 13 Oct 2011 20:37:08 +0000 Subject: [PATCH] llvm-objdump: Fix dumping of multiple symbols with the same address. This happens in COFF because there is a symbol for the beginning of each section. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@141885 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-objdump/llvm-objdump.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index 66669cfe5d7..45642f955fa 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -234,7 +234,18 @@ static void DisassembleObject(const ObjectFile *Obj) { // Disassemble symbol by symbol. for (unsigned si = 0, se = Symbols.size(); si != se; ++si) { uint64_t Start = Symbols[si].first; - uint64_t End = si == se-1 ? SectSize : Symbols[si + 1].first - 1; + uint64_t End; + // The end is either the size of the section or the beginning of the next + // symbol. + if (si == se - 1) + End = SectSize; + // Make sure this symbol takes up space. + else if (Symbols[si + 1].first != Start) + End = Symbols[si + 1].first - 1; + else + // This symbol has the same address as the next symbol. Skip it. + continue; + outs() << '\n' << Symbols[si].second << ":\n"; #ifndef NDEBUG -- 2.34.1