diff options
| author | Simon Tatham <simon.tatham@arm.com> | 2022-07-26 09:43:26 +0100 |
|---|---|---|
| committer | Simon Tatham <simon.tatham@arm.com> | 2022-07-26 10:02:37 +0100 |
| commit | 1c3d0a2e8754c942d7bae6dda36812b99538ce7a (patch) | |
| tree | cf79cb2ea3e5d1abb45eaa0ca1d5dab725a21d45 /llvm/tools/llvm-objdump/llvm-objdump.cpp | |
| parent | 10c2bab50e7aab5ad1cb5e8ecd3b12ddca3b19b4 (diff) | |
| download | llvm-1c3d0a2e8754c942d7bae6dda36812b99538ce7a.zip llvm-1c3d0a2e8754c942d7bae6dda36812b99538ce7a.tar.gz llvm-1c3d0a2e8754c942d7bae6dda36812b99538ce7a.tar.bz2 | |
[llvm-objdump] Fix type mismatch in std::min.
I broke the build just now by trying to do std::min between a size_t
and a uint64_t, which of course worked fine on my 64-bit test platform.
Diffstat (limited to 'llvm/tools/llvm-objdump/llvm-objdump.cpp')
| -rw-r--r-- | llvm/tools/llvm-objdump/llvm-objdump.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp index 3a260b0..fd83dc1 100644 --- a/llvm/tools/llvm-objdump/llvm-objdump.cpp +++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp @@ -1128,8 +1128,8 @@ static void collectLocalBranchTargets( bool Disassembled = DisAsm->getInstruction(Inst, Size, ThisBytes, Index, nulls()); if (Size == 0) - Size = std::min(ThisBytes.size(), - DisAsm->suggestBytesToSkip(ThisBytes, Index)); + Size = std::min<uint64_t>(ThisBytes.size(), + DisAsm->suggestBytesToSkip(ThisBytes, Index)); if (Disassembled && MIA) { uint64_t Target; @@ -1175,8 +1175,8 @@ static void addSymbolizer( ArrayRef<uint8_t> ThisBytes = Bytes.slice(Index - SectionAddr); DisAsm->getInstruction(Inst, Size, ThisBytes, Index, nulls()); if (Size == 0) - Size = std::min(ThisBytes.size(), - DisAsm->suggestBytesToSkip(ThisBytes, Index)); + Size = std::min<uint64_t>(ThisBytes.size(), + DisAsm->suggestBytesToSkip(ThisBytes, Index)); Index += Size; } ArrayRef<uint64_t> LabelAddrsRef = SymbolizerPtr->getReferencedAddresses(); @@ -1648,8 +1648,9 @@ static void disassembleObject(const Target *TheTarget, ObjectFile &Obj, bool Disassembled = DisAsm->getInstruction(Inst, Size, ThisBytes, ThisAddr, CommentStream); if (Size == 0) - Size = std::min(ThisBytes.size(), - DisAsm->suggestBytesToSkip(ThisBytes, ThisAddr)); + Size = std::min<uint64_t>( + ThisBytes.size(), + DisAsm->suggestBytesToSkip(ThisBytes, ThisAddr)); LVP.update({Index, Section.getIndex()}, {Index + Size, Section.getIndex()}, Index + Size != End); |