[llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervals.cpp RegAllocLinearScan.cpp

[Alkis Evlogimenos]

Changes in directory llvm/lib/CodeGen:

LiveIntervals.cpp updated: 1.61 -> 1.62
RegAllocLinearScan.cpp updated: 1.55 -> 1.56

---
Log message:

Move LiveIntervals.h to lib/CodeGen since it shouldn't be exposed to other parts of the compiler


---
Diffs of the changes:  (+4 -2)

Index: llvm/lib/CodeGen/LiveIntervals.cpp
diff -u llvm/lib/CodeGen/LiveIntervals.cpp:1.61 llvm/lib/CodeGen/LiveIntervals.cpp:1.62
--- llvm/lib/CodeGen/LiveIntervals.cpp:1.61	Sat Feb 21 23:46:04 2004
+++ llvm/lib/CodeGen/LiveIntervals.cpp	Sun Feb 22 18:50:15 2004
@@ -16,7 +16,6 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "liveintervals"
-#include "llvm/CodeGen/LiveIntervals.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/CodeGen/LiveVariables.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
@@ -31,6 +30,7 @@
 #include "Support/Debug.h"
 #include "Support/Statistic.h"
 #include "Support/STLExtras.h"
+#include "LiveIntervals.h"
 #include <cmath>
 #include <iostream>
 #include <limits>


Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.55 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.56
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.55	Sat Feb 21 23:46:04 2004
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Sun Feb 22 18:50:15 2004
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 #define DEBUG_TYPE "regalloc"
 #include "llvm/Function.h"
-#include "llvm/CodeGen/LiveIntervals.h"
 #include "llvm/CodeGen/LiveVariables.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
@@ -27,6 +26,7 @@
 #include "Support/DepthFirstIterator.h"
 #include "Support/Statistic.h"
 #include "Support/STLExtras.h"
+#include "LiveIntervals.h"
 #include <algorithm>
 using namespace llvm;
 
@@ -562,6 +562,8 @@
     // otherwise we spill all intervals aliasing the register with
     // minimum weight, rollback to the interval with the earliest
     // start point and let the linear scan algorithm run again
+    assert(MRegisterInfo::isPhysicalRegister(minReg) &&
+           "did not choose a register to spill?");
     std::vector<bool> toSpill(mri_->getNumRegs(), false);
     toSpill[minReg] = true;
     for (const unsigned* as = mri_->getAliasSet(minReg); *as; ++as)