diff options
author | Matthew Curtis <mcurtis@codeaurora.org> | 2012-12-07 21:03:15 +0000 |
---|---|---|
committer | Matthew Curtis <mcurtis@codeaurora.org> | 2012-12-07 21:03:15 +0000 |
commit | ade50dc6c7d18ba2e47aab7e535c709de76fe152 (patch) | |
tree | 5818f3fcb468e1a73c315d2b11e637e996edbbf0 /lib/Target/Hexagon/HexagonHardwareLoops.cpp | |
parent | 6cd738f33934a93b114d7dd9e4291f87f445c5c4 (diff) | |
download | llvm-ade50dc6c7d18ba2e47aab7e535c709de76fe152.tar.gz llvm-ade50dc6c7d18ba2e47aab7e535c709de76fe152.tar.bz2 llvm-ade50dc6c7d18ba2e47aab7e535c709de76fe152.tar.xz |
In hexagon convertToHardwareLoop, don't deref end() iterator
In particular, check if MachineBasicBlock::iterator is end() before
using it to call getDebugLoc();
See also this thread on llvm-commits:
http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20121112/155914.html
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169634 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/Hexagon/HexagonHardwareLoops.cpp')
-rw-r--r-- | lib/Target/Hexagon/HexagonHardwareLoops.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/lib/Target/Hexagon/HexagonHardwareLoops.cpp b/lib/Target/Hexagon/HexagonHardwareLoops.cpp index 2867597a59..d875fea575 100644 --- a/lib/Target/Hexagon/HexagonHardwareLoops.cpp +++ b/lib/Target/Hexagon/HexagonHardwareLoops.cpp @@ -461,6 +461,9 @@ bool HexagonHardwareLoops::convertToHardwareLoop(MachineLoop *L) { return false; } MachineBasicBlock::iterator LastI = LastMBB->getFirstTerminator(); + if (LastI == LastMBB->end()) { + return false; + } // Determine the loop start. MachineBasicBlock *LoopStart = L->getTopBlock(); @@ -478,6 +481,9 @@ bool HexagonHardwareLoops::convertToHardwareLoop(MachineLoop *L) { // Convert the loop to a hardware loop DEBUG(dbgs() << "Change to hardware loop at "; L->dump()); + DebugLoc InsertPosDL; + if (InsertPos != Preheader->end()) + InsertPosDL = InsertPos->getDebugLoc(); if (TripCount->isReg()) { // Create a copy of the loop count register. @@ -485,23 +491,23 @@ bool HexagonHardwareLoops::convertToHardwareLoop(MachineLoop *L) { const TargetRegisterClass *RC = MF->getRegInfo().getRegClass(TripCount->getReg()); unsigned CountReg = MF->getRegInfo().createVirtualRegister(RC); - BuildMI(*Preheader, InsertPos, InsertPos->getDebugLoc(), + BuildMI(*Preheader, InsertPos, InsertPosDL, TII->get(TargetOpcode::COPY), CountReg).addReg(TripCount->getReg()); if (TripCount->isNeg()) { unsigned CountReg1 = CountReg; CountReg = MF->getRegInfo().createVirtualRegister(RC); - BuildMI(*Preheader, InsertPos, InsertPos->getDebugLoc(), + BuildMI(*Preheader, InsertPos, InsertPosDL, TII->get(Hexagon::NEG), CountReg).addReg(CountReg1); } // Add the Loop instruction to the beginning of the loop. - BuildMI(*Preheader, InsertPos, InsertPos->getDebugLoc(), + BuildMI(*Preheader, InsertPos, InsertPosDL, TII->get(Hexagon::LOOP0_r)).addMBB(LoopStart).addReg(CountReg); } else { assert(TripCount->isImm() && "Expecting immedate vaule for trip count"); // Add the Loop immediate instruction to the beginning of the loop. int64_t CountImm = TripCount->getImm(); - BuildMI(*Preheader, InsertPos, InsertPos->getDebugLoc(), + BuildMI(*Preheader, InsertPos, InsertPosDL, TII->get(Hexagon::LOOP0_i)).addMBB(LoopStart).addImm(CountImm); } @@ -514,8 +520,9 @@ bool HexagonHardwareLoops::convertToHardwareLoop(MachineLoop *L) { BlockAddress::get(const_cast<BasicBlock *>(LoopStart->getBasicBlock())); // Replace the loop branch with an endloop instruction. - DebugLoc dl = LastI->getDebugLoc(); - BuildMI(*LastMBB, LastI, dl, TII->get(Hexagon::ENDLOOP0)).addMBB(LoopStart); + DebugLoc LastIDL = LastI->getDebugLoc(); + BuildMI(*LastMBB, LastI, LastIDL, + TII->get(Hexagon::ENDLOOP0)).addMBB(LoopStart); // The loop ends with either: // - a conditional branch followed by an unconditional branch, or @@ -530,7 +537,7 @@ bool HexagonHardwareLoops::convertToHardwareLoop(MachineLoop *L) { TII->RemoveBranch(*LastMBB); } SmallVector<MachineOperand, 0> Cond; - TII->InsertBranch(*LastMBB, BranchTarget, 0, Cond, dl); + TII->InsertBranch(*LastMBB, BranchTarget, 0, Cond, LastIDL); } } else { // Conditional branch to loop start; just delete it. |