projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Constify a few things with DotDebugLocEntry.
[oota-llvm.git]
/
lib
/
CodeGen
/
RegisterCoalescer.cpp
diff --git
a/lib/CodeGen/RegisterCoalescer.cpp
b/lib/CodeGen/RegisterCoalescer.cpp
index 6fc4bffdcf912a1176a0995e97dfa3c2d2e230db..43a841ad696bce2914be2bd3c841675541243749 100644
(file)
--- a/
lib/CodeGen/RegisterCoalescer.cpp
+++ b/
lib/CodeGen/RegisterCoalescer.cpp
@@
-15,7
+15,6
@@
#define DEBUG_TYPE "regalloc"
#include "RegisterCoalescer.h"
#define DEBUG_TYPE "regalloc"
#include "RegisterCoalescer.h"
-#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/Statistic.h"
@@
-801,9
+800,9
@@
bool RegisterCoalescer::reMaterializeTrivialDef(CoalescerPair &CP,
MachineBasicBlock *MBB = CopyMI->getParent();
MachineBasicBlock::iterator MII =
MachineBasicBlock *MBB = CopyMI->getParent();
MachineBasicBlock::iterator MII =
-
llvm
::next(MachineBasicBlock::iterator(CopyMI));
+
std
::next(MachineBasicBlock::iterator(CopyMI));
TII->reMaterialize(*MBB, MII, DstReg, SrcIdx, DefMI, *TRI);
TII->reMaterialize(*MBB, MII, DstReg, SrcIdx, DefMI, *TRI);
- MachineInstr *NewMI =
prior
(MII);
+ MachineInstr *NewMI =
std::prev
(MII);
LIS->ReplaceMachineInstrInMaps(CopyMI, NewMI);
CopyMI->eraseFromParent();
LIS->ReplaceMachineInstrInMaps(CopyMI, NewMI);
CopyMI->eraseFromParent();
@@
-952,7
+951,7
@@
void RegisterCoalescer::updateRegDefsUses(unsigned SrcReg,
SmallVector<unsigned,8> Ops;
bool Reads, Writes;
SmallVector<unsigned,8> Ops;
bool Reads, Writes;
- tie(Reads, Writes) = UseMI->readsWritesVirtualRegister(SrcReg, &Ops);
+
std::
tie(Reads, Writes) = UseMI->readsWritesVirtualRegister(SrcReg, &Ops);
// If SrcReg wasn't read, it may still be the case that DstReg is live-in
// because SrcReg is a sub-register.
// If SrcReg wasn't read, it may still be the case that DstReg is live-in
// because SrcReg is a sub-register.