Rename some methods, use 'begin' instead of 'start', add new LiveInterval
iterator/begin/end members.
llvm-svn: 17930
diff --git a/llvm/lib/CodeGen/RegAllocIterativeScan.cpp b/llvm/lib/CodeGen/RegAllocIterativeScan.cpp
index 4cdcc1d..e5f7be7 100644
--- a/llvm/lib/CodeGen/RegAllocIterativeScan.cpp
+++ b/llvm/lib/CodeGen/RegAllocIterativeScan.cpp
@@ -270,7 +270,7 @@
unsigned reg = i->reg;
// remove expired intervals
- if (i->expiredAt(cur->start())) {
+ if (i->expiredAt(cur->beginNumber())) {
DEBUG(std::cerr << "\t\tinterval " << *i << " expired\n");
if (MRegisterInfo::isVirtualRegister(reg))
reg = vrm_->getPhys(reg);
@@ -279,7 +279,7 @@
std::iter_swap(ii, --ie);
}
// move inactive intervals to inactive list
- else if (!i->liveAt(cur->start())) {
+ else if (!i->liveAt(cur->beginNumber())) {
DEBUG(std::cerr << "\t\tinterval " << *i << " inactive\n");
if (MRegisterInfo::isVirtualRegister(reg))
reg = vrm_->getPhys(reg);
@@ -305,13 +305,13 @@
unsigned reg = i->reg;
// remove expired intervals
- if (i->expiredAt(cur->start())) {
+ if (i->expiredAt(cur->beginNumber())) {
DEBUG(std::cerr << "\t\tinterval " << *i << " expired\n");
// swap with last element and move end iterator back one position
std::iter_swap(ii, --ie);
}
// move re-activated intervals in active list
- else if (i->liveAt(cur->start())) {
+ else if (i->liveAt(cur->beginNumber())) {
DEBUG(std::cerr << "\t\tinterval " << *i << " active\n");
if (MRegisterInfo::isVirtualRegister(reg))
reg = vrm_->getPhys(reg);
@@ -424,7 +424,7 @@
toSpill[minReg] = true;
for (const unsigned* as = mri_->getAliasSet(minReg); *as; ++as)
toSpill[*as] = true;
- unsigned earliestStart = cur->start();
+ unsigned earliestStart = cur->beginNumber();
std::set<unsigned> spilled;