From cf14613455bc32b6a17821808595263e061335bc Mon Sep 17 00:00:00 2001 From: Jakob Stoklund Olesen Date: Thu, 23 Feb 2012 01:13:32 +0000 Subject: [PATCH] Track reserved registers separately from RegsAvailable. The bulk masking operations from register mask operands don't account for reserved registers. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@151222 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/RegisterScavenging.h | 5 +++-- lib/CodeGen/RegisterScavenging.cpp | 9 ++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/llvm/CodeGen/RegisterScavenging.h b/include/llvm/CodeGen/RegisterScavenging.h index 8f90ca796b2..3986a8dd7da 100644 --- a/include/llvm/CodeGen/RegisterScavenging.h +++ b/include/llvm/CodeGen/RegisterScavenging.h @@ -134,8 +134,9 @@ private: /// isUsed / isUnused - Test if a register is currently being used. /// - bool isUsed(unsigned Reg) const { return !RegsAvailable.test(Reg); } - bool isUnused(unsigned Reg) const { return RegsAvailable.test(Reg); } + bool isUsed(unsigned Reg) const { + return !RegsAvailable.test(Reg) || ReservedRegs.test(Reg); + } /// isAliasUsed - Is Reg or an alias currently in use? bool isAliasUsed(unsigned Reg) const; diff --git a/lib/CodeGen/RegisterScavenging.cpp b/lib/CodeGen/RegisterScavenging.cpp index bb31e0a7743..18523e5e697 100644 --- a/lib/CodeGen/RegisterScavenging.cpp +++ b/lib/CodeGen/RegisterScavenging.cpp @@ -59,9 +59,6 @@ void RegScavenger::initRegState() { // All registers started out unused. RegsAvailable.set(); - // Reserved registers are always used. - RegsAvailable ^= ReservedRegs; - if (!MBB) return; @@ -225,9 +222,11 @@ void RegScavenger::forward() { void RegScavenger::getRegsUsed(BitVector &used, bool includeReserved) { used = RegsAvailable; - if (!includeReserved) - used |= ReservedRegs; used.flip(); + if (includeReserved) + used |= ReservedRegs; + else + used.reset(ReservedRegs); } unsigned RegScavenger::FindUnusedReg(const TargetRegisterClass *RC) const { -- 2.34.1