projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MachineSink] Use the real post dominator tree
[oota-llvm.git]
/
lib
/
CodeGen
/
Spiller.cpp
diff --git
a/lib/CodeGen/Spiller.cpp
b/lib/CodeGen/Spiller.cpp
index 560b040a40daedee634f22d13d074ef7591c343c..af3da9e16b44ba7833794a441781c1c5f5c8648e 100644
(file)
--- a/
lib/CodeGen/Spiller.cpp
+++ b/
lib/CodeGen/Spiller.cpp
@@
-7,8
+7,6
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
-#define DEBUG_TYPE "spiller"
-
#include "Spiller.h"
#include "llvm/CodeGen/LiveIntervalAnalysis.h"
#include "llvm/CodeGen/LiveRangeEdit.h"
#include "Spiller.h"
#include "llvm/CodeGen/LiveIntervalAnalysis.h"
#include "llvm/CodeGen/LiveRangeEdit.h"
@@
-28,6
+26,8
@@
using namespace llvm;
using namespace llvm;
+#define DEBUG_TYPE "spiller"
+
namespace {
enum SpillerName { trivial, inline_ };
}
namespace {
enum SpillerName { trivial, inline_ };
}
@@
-65,8
+65,8
@@
protected:
lis = &pass.getAnalysis<LiveIntervals>();
mfi = mf.getFrameInfo();
mri = &mf.getRegInfo();
lis = &pass.getAnalysis<LiveIntervals>();
mfi = mf.getFrameInfo();
mri = &mf.getRegInfo();
- tii = mf.get
T
arget().getInstrInfo();
- tri = mf.get
T
arget().getRegisterInfo();
+ tii = mf.get
Subt
arget().getInstrInfo();
+ tri = mf.get
Subt
arget().getRegisterInfo();
}
/// Add spill ranges for every use/def of the live interval, inserting loads
}
/// Add spill ranges for every use/def of the live interval, inserting loads
@@
-89,8
+89,9
@@
protected:
unsigned ss = vrm->assignVirt2StackSlot(li->reg);
// Iterate over reg uses/defs.
unsigned ss = vrm->assignVirt2StackSlot(li->reg);
// Iterate over reg uses/defs.
- for (MachineRegisterInfo::reg_iterator
- regItr = mri->reg_begin(li->reg); regItr != mri->reg_end();) {
+ for (MachineRegisterInfo::reg_instr_iterator
+ regItr = mri->reg_instr_begin(li->reg);
+ regItr != mri->reg_instr_end();) {
// Grab the use/def instr.
MachineInstr *mi = &*regItr;
// Grab the use/def instr.
MachineInstr *mi = &*regItr;
@@
-98,9
+99,7
@@
protected:
DEBUG(dbgs() << " Processing " << *mi);
// Step regItr to the next use/def instr.
DEBUG(dbgs() << " Processing " << *mi);
// Step regItr to the next use/def instr.
- do {
- ++regItr;
- } while (regItr != mri->reg_end() && (&*regItr == mi));
+ ++regItr;
// Collect uses & defs for this instr.
SmallVector<unsigned, 2> indices;
// Collect uses & defs for this instr.
SmallVector<unsigned, 2> indices;
@@
-164,7
+163,7
@@
public:
VirtRegMap &vrm)
: SpillerBase(pass, mf, vrm) {}
VirtRegMap &vrm)
: SpillerBase(pass, mf, vrm) {}
- void spill(LiveRangeEdit &LRE) {
+ void spill(LiveRangeEdit &LRE)
override
{
// Ignore spillIs - we don't use it.
trivialSpillEverywhere(LRE);
}
// Ignore spillIs - we don't use it.
trivialSpillEverywhere(LRE);
}