1 files changed, 4 insertions, 2 deletions
diff --git a/lib/CodeGen/RegAllocLinearScan.cpp b/lib/CodeGen/RegAllocLinearScan.cpp
index 3ab4b02668..c6f714a9cb 100644
--- a/lib/CodeGen/RegAllocLinearScan.cpp
+++ b/lib/CodeGen/RegAllocLinearScan.cpp
@@ -58,7 +58,7 @@ namespace {
     RALinScan() : MachineFunctionPass((intptr_t)&ID) {}
 
     typedef std::pair<LiveInterval*, LiveInterval::iterator> IntervalPtr;
-    typedef std::vector<IntervalPtr> IntervalPtrs;
+    typedef SmallVector<IntervalPtr, 32> IntervalPtrs;
   private:
     /// RelatedRegClasses - This structure is built the first time a function is
     /// compiled, and keeps track of which register classes have registers that
@@ -94,7 +94,7 @@ namespace {
     IntervalPtrs inactive_;
 
     typedef std::priority_queue<LiveInterval*,
-                                std::vector<LiveInterval*>,
+                                SmallVector<LiveInterval*, 64>,
                                 greater_ptr<LiveInterval> > IntervalHeap;
     IntervalHeap unhandled_;
     std::auto_ptr<PhysRegTracker> prt_;
@@ -322,6 +322,8 @@ void RALinScan::initIntervalSets()
          active_.empty() && inactive_.empty() &&
          "interval sets should be empty on initialization");
 
+  handled_.reserve(li_->getNumIntervals());
+
   for (LiveIntervals::iterator i = li_->begin(), e = li_->end(); i != e; ++i) {
     if (TargetRegisterInfo::isPhysicalRegister(i->second->reg)) {
       reginfo_->setPhysRegUsed(i->second->reg);