[llvm-commits] [llvm] r83897 - /llvm/trunk/lib/Target/ARM/ARMConstantIslandPass.cpp

[Bob Wilson]

Author: bwilson
Date: Mon Oct 12 15:45:53 2009
New Revision: 83897

URL: http://llvm.org/viewvc/llvm-project?rev=83897&view=rev
Log:
Another minor clean-up.

Modified:
    llvm/trunk/lib/Target/ARM/ARMConstantIslandPass.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMConstantIslandPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMConstantIslandPass.cpp?rev=83897&r1=83896&r2=83897&view=diff

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