X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FBlockFrequency.cpp;h=5e45e46cf9743d73bb5f44f221dba936aa7f8571;hb=e2ff00e117ba9b758b298e671f65c0b002f8a52d;hp=8de517fad6416cb1ca059087096d833a67b89beb;hpb=e187512bde9fd090a78924928a0b8793e3d87cbb;p=oota-llvm.git

diff --git a/lib/Support/BlockFrequency.cpp b/lib/Support/BlockFrequency.cpp
index 8de517fad64..5e45e46cf97 100644
--- a/lib/Support/BlockFrequency.cpp
+++ b/lib/Support/BlockFrequency.cpp
@@ -47,9 +47,7 @@ static uint64_t div96bit(uint64_t W[2], uint32_t D) {
   uint64_t x = W[1];
   unsigned i;
 
-  // This is really a 64-bit division.
-  if (!x)
-    return y / D;
+  assert(x != 0 && "This is really a 64-bit division");
 
   // This long division algorithm automatically saturates on overflow.
   for (i = 0; i < 64 && x; ++i) {
@@ -75,7 +73,7 @@ void BlockFrequency::scale(uint32_t N, uint32_t D) {
   uint64_t MulRes = (MulHi << 32) + MulLo;
 
   // If the product fits in 64 bits, just use built-in division.
-  if (MulHi <= UINT32_MAX && MulRes <= MulLo) {
+  if (MulHi <= UINT32_MAX && MulRes >= MulLo) {
     Frequency = MulRes / D;
     return;
   }