[llvm-branch-commits] [llvm-branch] r89476 - /llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMConstantIslandPass.cpp

[Jim Grosbach]

Author: grosbach
Date: Fri Nov 20 13:53:15 2009
New Revision: 89476

URL: http://llvm.org/viewvc/llvm-project?rev=89476&view=rev
Log:
merge 89473

Modified:
    llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMConstantIslandPass.cpp

Modified: llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMConstantIslandPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMConstantIslandPass.cpp?rev=89476&r1=89475&r2=89476&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMConstantIslandPass.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/Target/ARM/ARMConstantIslandPass.cpp Fri Nov 20 13:53:15 2009
@@ -279,12 +279,15 @@
              (BBOffsets[MBBId]%4 != 0 && BBSizes[MBBId]%4 != 0));
     }
   }
-#endif
   for (unsigned i = 0, e = CPUsers.size(); i != e; ++i) {
     CPUser &U = CPUsers[i];
     unsigned UserOffset = GetOffsetOf(U.MI) + (isThumb ? 4 : 8);
-    assert (CPEIsInRange(U.MI, UserOffset, U.CPEMI, U.MaxDisp, U.NegOk, true));
+    unsigned CPEOffset  = GetOffsetOf(U.CPEMI);
+    unsigned Disp = UserOffset < CPEOffset ? CPEOffset - UserOffset :
+      UserOffset - CPEOffset;
+    assert(Disp <= U.MaxDisp || "Constant pool entry out of range!");
   }
+#endif
 }
 
 /// print block size and offset information - debugging