Merge safe parts from last night's buggy commit. These do not break
any test cases :-)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11032 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/LiveIntervalAnalysis.h b/lib/CodeGen/LiveIntervalAnalysis.h
index 7cf627b..f322ae3 100644
--- a/lib/CodeGen/LiveIntervalAnalysis.h
+++ b/lib/CodeGen/LiveIntervalAnalysis.h
@@ -9,12 +9,12 @@
//
// This file implements the LiveInterval analysis pass. Given some
// numbering of each the machine instructions (in this implemention
-// depth-first order) an interval [i, j] is said to be a live interval
+// depth-first order) an interval [i, j) is said to be a live interval
// for register v if there is no instruction with number j' > j such
// that v is live at j' abd there is no instruction with number i' < i
// such that v is live at i'. In this implementation intervals can
-// have holes, i.e. an interval might look like [1,20], [50,65],
-// [1000,1001]
+// have holes, i.e. an interval might look like [1,20), [50,65),
+// [1000,1001)
//
//===----------------------------------------------------------------------===//
@@ -22,11 +22,7 @@
#define LLVM_CODEGEN_LIVEINTERVALS_H
#include "llvm/CodeGen/MachineFunctionPass.h"
-#include "llvm/CodeGen/MachineBasicBlock.h"
-#include <iostream>
#include <list>
-#include <map>
-#include <vector>
namespace llvm {
@@ -113,19 +109,13 @@
public:
virtual void getAnalysisUsage(AnalysisUsage &AU) const;
+ virtual void releaseMemory();
+
+ /// runOnMachineFunction - pass entry point
+ virtual bool runOnMachineFunction(MachineFunction&);
Intervals& getIntervals() { return intervals_; }
- MachineBasicBlockPtrs getOrderedMachineBasicBlockPtrs() const {
- MachineBasicBlockPtrs result;
- for (MbbIndex2MbbMap::const_iterator
- it = mbbi2mbbMap_.begin(), itEnd = mbbi2mbbMap_.end();
- it != itEnd; ++it) {
- result.push_back(it->second);
- }
- return result;
- }
-
const Reg2RegMap& getJoinedRegMap() const {
return r2rMap_;
}
@@ -134,9 +124,6 @@
unsigned rep(unsigned reg);
private:
- /// runOnMachineFunction - pass entry point
- bool runOnMachineFunction(MachineFunction&);
-
/// computeIntervals - compute live intervals
void computeIntervals();