Tweak to ignoring reserved regs. The allocator was occasionally still looking

at them since they'd end up in the register weights list. Tell it to stop
doing that.

llvm-svn: 112756

1 files changed, 4 insertions, 2 deletions

diff --git a/llvm/lib/CodeGen/RegAllocLinearScan.cpp b/llvm/lib/CodeGen/RegAllocLinearScan.cpp
index 32dda273d08..5c62354a887 100644
--- a/llvm/lib/CodeGen/RegAllocLinearScan.cpp
+++ b/llvm/lib/CodeGen/RegAllocLinearScan.cpp
@@ -1147,9 +1147,11 @@ void RALinScan::assignRegOrStackSlotAtInterval(LiveInterval* cur) {
            e = RC->allocation_order_end(*mf_); i != e; ++i) {
       unsigned reg = *i;
       float regWeight = SpillWeights[reg];
+      // Don't even consider reserved regs.
+      if (reservedRegs_.test(reg))
+        continue;
       // Skip recently allocated registers and reserved registers.
-      if (minWeight > regWeight && !isRecentlyUsed(reg) &&
-          !reservedRegs_.test(reg))
+      if (minWeight > regWeight && !isRecentlyUsed(reg))
         Found = true;
       RegsWeights.push_back(std::make_pair(reg, regWeight));
     }