diff options
| author | Fangrui Song <maskray@google.com> | 2019-04-20 07:48:41 +0000 |
|---|---|---|
| committer | Fangrui Song <maskray@google.com> | 2019-04-20 07:48:41 +0000 |
| commit | b48e41be96251d39d8894f571f803d8d4831b952 (patch) | |
| tree | 389c57cec02c3fa0ff9e020dff611788974db1c7 /llvm/tools/llvm-objdump/llvm-objdump.cpp | |
| parent | 2e33f8de57744ba800f1831d76cb2b4b6b68d8bc (diff) | |
| download | llvm-b48e41be96251d39d8894f571f803d8d4831b952.zip llvm-b48e41be96251d39d8894f571f803d8d4831b952.tar.gz llvm-b48e41be96251d39d8894f571f803d8d4831b952.tar.bz2 | |
[llvm-objdump] Fix End in disassemblyObject after rL358806
llvm-svn: 358809
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 37b17cb..69a9785 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -1153,9 +1153,9 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj, // The end is the section end, the beginning of the next symbol, or // --stop-address. - uint64_t End = std::min<uint64_t>( - SI + 1 < SE ? std::get<0>(Symbols[SI + 1]) : SectionAddr + SectSize, - StopAddress); + uint64_t End = std::min<uint64_t>(SectionAddr + SectSize, StopAddress); + if (SI + 1 < SE) + End = std::min(End, std::get<0>(Symbols[SI + 1])); if (Start >= End || End <= StartAddress) continue; Start -= SectionAddr; |