From c0767e029da2ed84c1f76d0be53e2c65695e20d5 Mon Sep 17 00:00:00 2001 From: Jakob Stoklund Olesen Date: Fri, 14 Jan 2011 01:17:53 +0000 Subject: Try again to teach getFirstTerminator() about debug values. Fix some callers to better deal with debug values. llvm-svn: 123419 --- llvm/lib/CodeGen/MachineBasicBlock.cpp | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'llvm/lib/CodeGen/MachineBasicBlock.cpp') diff --git a/llvm/lib/CodeGen/MachineBasicBlock.cpp b/llvm/lib/CodeGen/MachineBasicBlock.cpp index ad1ab287e345..36963875f9e4 100644 --- a/llvm/lib/CodeGen/MachineBasicBlock.cpp +++ b/llvm/lib/CodeGen/MachineBasicBlock.cpp @@ -155,11 +155,22 @@ MachineBasicBlock::SkipPHIsAndLabels(MachineBasicBlock::iterator I) { } MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() { - iterator I = end(); - while (I != begin() && (--I)->getDesc().isTerminator()) - ; /*noop */ - if (I != end() && !I->getDesc().isTerminator()) ++I; - return I; + iterator B = begin(), I = end(); + iterator Term = I; + while (I != B) { + --I; + // Ignore any debug values after the first terminator. + if (I->isDebugValue()) + continue; + // Stop once we see a non-debug non-terminator. + if (!I->getDesc().isTerminator()) + break; + // Earliest terminator so far. + Term = I; + } + // Return the first terminator, or end(). + // Everything after Term is terminators and debug values. + return Term; } MachineBasicBlock::iterator MachineBasicBlock::getLastNonDebugInstr() { -- cgit v1.2.3