MathExtras: Bring Count(Trailing|Leading)Ones and CountPopulation in line with countT...

[oota-llvm.git] / lib / CodeGen / VirtRegMap.cpp

diff --git a/lib/CodeGen/VirtRegMap.cpp b/lib/CodeGen/VirtRegMap.cpp
index a43e3341a992176c5242e8e5dc26beca8314b326..7d3b0cea1c150ccc237cc22db99d1f3d932d4a51 100644 (file)
--- a/lib/CodeGen/VirtRegMap.cpp
+++ b/lib/CodeGen/VirtRegMap.cpp
@@ -253,17 +253,15 @@ void VirtRegRewriter::addMBBLiveIns() {
     assert(PhysReg != VirtRegMap::NO_PHYS_REG && "Unmapped virtual register.");
 
     if (LI.hasSubRanges()) {
-      for (LiveInterval::subrange_iterator S = LI.subrange_begin(),
-           SE = LI.subrange_end(); S != SE; ++S) {
-        for (LiveRange::const_iterator I = S->begin(), E = S->end(); I != E;
-             ++I) {
-          if (!Indexes->findLiveInMBBs(I->start, I->end, LiveIn))
+      for (LiveInterval::SubRange &S : LI.subranges()) {
+        for (const auto &Seg : S.segments) {
+          if (!Indexes->findLiveInMBBs(Seg.start, Seg.end, LiveIn))
             continue;
           for (MCSubRegIndexIterator SR(PhysReg, TRI); SR.isValid(); ++SR) {
             unsigned SubReg = SR.getSubReg();
             unsigned SubRegIndex = SR.getSubRegIndex();
             unsigned SubRegLaneMask = TRI->getSubRegIndexLaneMask(SubRegIndex);
-            if ((SubRegLaneMask & S->LaneMask) == 0)
+            if ((SubRegLaneMask & S.LaneMask) == 0)
               continue;
             for (unsigned i = 0, e = LiveIn.size(); i != e; ++i) {
               if (!LiveIn[i]->isLiveIn(SubReg))
@@ -275,9 +273,8 @@ void VirtRegRewriter::addMBBLiveIns() {
       }
     } else {
       // Scan the segments of LI.
-      for (LiveInterval::const_iterator I = LI.begin(), E = LI.end(); I != E;
-           ++I) {
-        if (!Indexes->findLiveInMBBs(I->start, I->end, LiveIn))
+      for (const auto &Seg : LI.segments) {
+        if (!Indexes->findLiveInMBBs(Seg.start, Seg.end, LiveIn))
           continue;
         for (unsigned i = 0, e = LiveIn.size(); i != e; ++i)
           if (!LiveIn[i]->isLiveIn(PhysReg))