From: Jakob Stoklund Olesen Date: Fri, 4 Jan 2013 22:17:31 +0000 (+0000) Subject: Move an assertion so it doesn't dereference end(). X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=73a853f05c913f6127e93cf0df3ba6398bcfc213;p=oota-llvm.git Move an assertion so it doesn't dereference end(). The R600 target has test cases that exercises this code. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171538 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/MachineInstrBundle.cpp b/lib/CodeGen/MachineInstrBundle.cpp index ffca550f8b6..77bcd1d7c8e 100644 --- a/lib/CodeGen/MachineInstrBundle.cpp +++ b/lib/CodeGen/MachineInstrBundle.cpp @@ -224,14 +224,13 @@ bool llvm::finalizeBundles(MachineFunction &MF) { bool Changed = false; for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E; ++I) { MachineBasicBlock &MBB = *I; - MachineBasicBlock::instr_iterator MII = MBB.instr_begin(); - assert(!MII->isInsideBundle() && - "First instr cannot be inside bundle before finalization!"); - MachineBasicBlock::instr_iterator MIE = MBB.instr_end(); if (MII == MIE) continue; + assert(!MII->isInsideBundle() && + "First instr cannot be inside bundle before finalization!"); + for (++MII; MII != MIE; ) { if (!MII->isInsideBundle()) ++MII;