Target/Hexagon: Tweak to fix msvc build.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@154758 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/Hexagon/HexagonCopyToCombine.cpp b/lib/Target/Hexagon/HexagonCopyToCombine.cpp
index 90ff54339641c38fd0dff75aa96932d152ec0597..516b54e419ebb768698dcd7e9206eebcb278b243 100644 (file)
--- a/lib/Target/Hexagon/HexagonCopyToCombine.cpp
+++ b/lib/Target/Hexagon/HexagonCopyToCombine.cpp
@@ -224,7 +224,7 @@ bool HexagonCopyToCombine::isSafeToMoveTogether(MachineInstr *I1,
   {
     // Look at instructions I in between I1 and (including) I2.
     MachineBasicBlock::iterator I(I1),
-      End(next(MachineBasicBlock::iterator(I2)));
+      End(llvm::next(MachineBasicBlock::iterator(I2)));
     bool IsImmUseReg = I1->getOperand(1).isImm();
     unsigned I1UseReg = IsImmUseReg ? 0 : I1->getOperand(1).getReg();
     // Track killed operands. If we move accross an instruction that kills our
@@ -317,7 +317,7 @@ bool HexagonCopyToCombine::runOnMachineFunction(MachineFunction &MF) {
 /// false if the combine must be inserted at the returned instruction.
 MachineInstr *HexagonCopyToCombine::findPairable(MachineInstr *I1,
                                                  bool &DoInsertAtI1) {
-  MachineBasicBlock::iterator I2 = next(MachineBasicBlock::iterator(I1));
+  MachineBasicBlock::iterator I2 = llvm::next(MachineBasicBlock::iterator(I1));
   unsigned I1DestReg = I1->getOperand(0).getReg();
 
   for (MachineBasicBlock::iterator End = I1->getParent()->end(); I2 != End;