From 83a162ef8591d26b6105114e83061c600eb89749 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Fri, 22 Jul 2011 18:35:09 +0000 Subject: [PATCH] llvm-objdump: Skip branches that leave the current function. In "normal" code these only happen when disassembling data, so we won't lose anything if we just drop them. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135786 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-objdump/MCFunction.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/llvm-objdump/MCFunction.cpp b/tools/llvm-objdump/MCFunction.cpp index eef58cd13e0..4a4f9d5e50a 100644 --- a/tools/llvm-objdump/MCFunction.cpp +++ b/tools/llvm-objdump/MCFunction.cpp @@ -46,7 +46,10 @@ MCFunction::createFunctionFromMC(StringRef Name, const MCDisassembler *DisAsm, int64_t Imm = Inst.getOperand(0).getImm(); // FIXME: Distinguish relocations from nop jumps. if (Imm != 0) { - assert(Index+Imm+Size < End && "Branch out of function."); + if (Index+Imm+Size >= End) { + Instructions.push_back(MCDecodedInst(Index, Size, Inst)); + continue; // Skip branches that leave the function. + } Splits.insert(Index+Imm+Size); } } -- 2.34.1