From 1c3d0a2e8754c942d7bae6dda36812b99538ce7a Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Tue, 26 Jul 2022 09:43:26 +0100 Subject: [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. --- llvm/tools/llvm-objdump/llvm-objdump.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 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(ThisBytes.size(), + DisAsm->suggestBytesToSkip(ThisBytes, Index)); if (Disassembled && MIA) { uint64_t Target; @@ -1175,8 +1175,8 @@ static void addSymbolizer( ArrayRef 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(ThisBytes.size(), + DisAsm->suggestBytesToSkip(ThisBytes, Index)); Index += Size; } ArrayRef 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( + ThisBytes.size(), + DisAsm->suggestBytesToSkip(ThisBytes, ThisAddr)); LVP.update({Index, Section.getIndex()}, {Index + Size, Section.getIndex()}, Index + Size != End); -- cgit v1.1