Rename Interval class to LiveInterval to avoid conflicting with the already
existing llvm::Interval class.
Patch contributed by Vladimir Prus!
http://mail.cs.uiuc.edu/pipermail/llvmbugs/2004-June/000710.html
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14281 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/LiveIntervalAnalysis.h b/lib/CodeGen/LiveIntervalAnalysis.h
index 3e3c817..4294472 100644
--- a/lib/CodeGen/LiveIntervalAnalysis.h
+++ b/lib/CodeGen/LiveIntervalAnalysis.h
@@ -30,7 +30,7 @@
class MRegisterInfo;
class VirtRegMap;
- struct Interval {
+ struct LiveInterval {
typedef std::pair<unsigned, unsigned> Range;
typedef std::vector<Range> Ranges;
unsigned reg; // the register of this interval
@@ -38,7 +38,7 @@
// (number of uses *10^loopDepth)
Ranges ranges; // the ranges in which this register is live
- explicit Interval(unsigned r);
+ explicit LiveInterval(unsigned r);
bool empty() const { return ranges.empty(); }
@@ -60,17 +60,17 @@
bool liveAt(unsigned index) const;
- bool overlaps(const Interval& other) const;
+ bool overlaps(const LiveInterval& other) const;
void addRange(unsigned start, unsigned end);
- void join(const Interval& other);
+ void join(const LiveInterval& other);
- bool operator<(const Interval& other) const {
+ bool operator<(const LiveInterval& other) const {
return start() < other.start();
}
- bool operator==(const Interval& other) const {
+ bool operator==(const LiveInterval& other) const {
return reg == other.reg;
}
@@ -79,12 +79,12 @@
Ranges::iterator mergeRangesBackward(Ranges::iterator it);
};
- std::ostream& operator<<(std::ostream& os, const Interval& li);
+ std::ostream& operator<<(std::ostream& os, const LiveInterval& li);
class LiveIntervals : public MachineFunctionPass
{
public:
- typedef std::list<Interval> Intervals;
+ typedef std::list<LiveInterval> Intervals;
private:
MachineFunction* mf_;
@@ -148,7 +148,7 @@
/// runOnMachineFunction - pass entry point
virtual bool runOnMachineFunction(MachineFunction&);
- Interval& getInterval(unsigned reg) {
+ LiveInterval& getInterval(unsigned reg) {
assert(r2iMap_.count(reg)&& "Interval does not exist for register");
return *r2iMap_.find(reg)->second;
}
@@ -162,9 +162,9 @@
Intervals& getIntervals() { return intervals_; }
- std::vector<Interval*> addIntervalsForSpills(const Interval& i,
- VirtRegMap& vrm,
- int slot);
+ std::vector<LiveInterval*> addIntervalsForSpills(const LiveInterval& i,
+ VirtRegMap& vrm,
+ int slot);
private:
/// computeIntervals - compute live intervals
@@ -184,18 +184,19 @@
/// register def
void handleVirtualRegisterDef(MachineBasicBlock* mbb,
MachineBasicBlock::iterator mi,
- Interval& interval);
+ LiveInterval& interval);
/// handlePhysicalRegisterDef - update intervals for a
/// physical register def
void handlePhysicalRegisterDef(MachineBasicBlock* mbb,
MachineBasicBlock::iterator mi,
- Interval& interval);
+ LiveInterval& interval);
- bool overlapsAliases(const Interval& lhs, const Interval& rhs) const;
+ bool overlapsAliases(const LiveInterval& lhs,
+ const LiveInterval& rhs) const;
- Interval& getOrCreateInterval(unsigned reg);
+ LiveInterval& getOrCreateInterval(unsigned reg);
/// rep - returns the representative of this register
unsigned rep(unsigned reg);