diff options
author | James Henderson <james.henderson@sony.com> | 2020-04-07 11:51:26 +0100 |
---|---|---|
committer | James Henderson <james.henderson@sony.com> | 2020-04-08 10:57:12 +0100 |
commit | abd335a339cb2c5aaf30463ff8451f1eb6e223c7 (patch) | |
tree | d87b18f7ede5a06ebc1b7d28712bd45c37d593f8 /llvm/tools/llvm-objdump/llvm-objdump.cpp | |
parent | 01d97a35493a8a306bfaa3ceb3e6fa49b05dea89 (diff) | |
download | llvm-abd335a339cb2c5aaf30463ff8451f1eb6e223c7.zip llvm-abd335a339cb2c5aaf30463ff8451f1eb6e223c7.tar.gz llvm-abd335a339cb2c5aaf30463ff8451f1eb6e223c7.tar.bz2 |
[llvm-objdump] Fix unstable disassembly output for sections with same address
When two sections shared the same address, the disassembly code was
using pointer values when sorting (see the SectionRef less than
operator). Since those values aren't guaranteed to have a specific
order, this meant the disassembly code would sometimes change which
section to pick when finding symbols targeted by calls in fully linked
objects.
This change fixes the non-determinism, so that the same section is
always picked. This might have a negative impact in that now a section
without any symbol might be picked over a section with symbols, but this
will be addressed in a later commit.
Fixes https://bugs.llvm.org/show_bug.cgi?id=45411.
Reviewed by: grimar, MaskRay
Differential Revision: https://reviews.llvm.org/D77640
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
-rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 06a4978..2f9c6f1 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -1249,7 +1249,7 @@ static void disassembleObject(const Target *TheTarget, const ObjectFile *Obj, std::vector<std::pair<uint64_t, SectionRef>> SectionAddresses; for (SectionRef Sec : Obj->sections()) SectionAddresses.emplace_back(Sec.getAddress(), Sec); - stable_sort(SectionAddresses); + llvm::stable_sort(SectionAddresses, llvm::less_first()); // Linked executables (.exe and .dll files) typically don't include a real // symbol table but they might contain an export table. |