[Hexagon] Check for block end when skipping debug instructions

llvm-svn: 279681

1 files changed, 3 insertions, 4 deletions

diff --git a/llvm/lib/Target/Hexagon/HexagonCopyToCombine.cpp b/llvm/lib/Target/Hexagon/HexagonCopyToCombine.cpp
index 29a9e5ff217..dc0357223f7 100644
--- a/llvm/lib/Target/Hexagon/HexagonCopyToCombine.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonCopyToCombine.cpp
@@ -476,6 +476,7 @@ bool HexagonCopyToCombine::runOnMachineFunction(MachineFunction &MF) {
   // Traverse basic blocks.
   for (MachineFunction::iterator BI = MF.begin(), BE = MF.end(); BI != BE;
        ++BI) {
+dbgs() << "BB#" << BI->getNumber() << "\n";
     PotentiallyNewifiableTFR.clear();
     findPotentialNewifiableTFRs(*BI);
 
@@ -521,10 +522,8 @@ MachineInstr *HexagonCopyToCombine::findPairable(MachineInstr &I1,
                                                  bool &DoInsertAtI1,
                                                  bool AllowC64) {
   MachineBasicBlock::iterator I2 = std::next(MachineBasicBlock::iterator(I1));
-
-  if (I2 != I1.getParent()->end())
-    while (I2->isDebugValue())
-      ++I2;
+  while (I2 != I1.getParent()->end() && I2->isDebugValue())
+    ++I2;
 
   unsigned I1DestReg = I1.getOperand(0).getReg();