Another minor clean-up.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@83897 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bob Wilson 2009-10-12 20:45:53 +00:00
parent f1787b055c
commit 32c50e8f99

View File

@ -952,11 +952,11 @@ MachineBasicBlock *ARMConstantIslands::AcceptWater(water_iterator IP) {
/// group, prefer the water that's farthest away. /// group, prefer the water that's farthest away.
bool ARMConstantIslands::LookForWater(CPUser &U, unsigned UserOffset, bool ARMConstantIslands::LookForWater(CPUser &U, unsigned UserOffset,
MachineBasicBlock *&NewMBB) { MachineBasicBlock *&NewMBB) {
water_iterator IPThatWouldPad;
MachineBasicBlock* WaterBBThatWouldPad = NULL;
if (WaterList.empty()) if (WaterList.empty())
return false; return false;
bool FoundWaterThatWouldPad = false;
water_iterator IPThatWouldPad;
for (water_iterator IP = prior(WaterList.end()), for (water_iterator IP = prior(WaterList.end()),
B = WaterList.begin();; --IP) { B = WaterList.begin();; --IP) {
MachineBasicBlock* WaterBB = *IP; MachineBasicBlock* WaterBB = *IP;
@ -966,8 +966,8 @@ bool ARMConstantIslands::LookForWater(CPUser &U, unsigned UserOffset,
(BBOffsets[WBBId] + BBSizes[WBBId])%4 != 0) { (BBOffsets[WBBId] + BBSizes[WBBId])%4 != 0) {
// This is valid Water, but would introduce padding. Remember // This is valid Water, but would introduce padding. Remember
// it in case we don't find any Water that doesn't do this. // it in case we don't find any Water that doesn't do this.
if (!WaterBBThatWouldPad) { if (!FoundWaterThatWouldPad) {
WaterBBThatWouldPad = WaterBB; FoundWaterThatWouldPad = true;
IPThatWouldPad = IP; IPThatWouldPad = IP;
} }
} else { } else {
@ -978,7 +978,7 @@ bool ARMConstantIslands::LookForWater(CPUser &U, unsigned UserOffset,
if (IP == B) if (IP == B)
break; break;
} }
if (isThumb && WaterBBThatWouldPad) { if (FoundWaterThatWouldPad) {
NewMBB = AcceptWater(IPThatWouldPad); NewMBB = AcceptWater(IPThatWouldPad);
return true; return true;
} }