From 3192b2fceabc4d0d9fb91fcef59cde41749b66a0 Mon Sep 17 00:00:00 2001 From: Jakob Stoklund Olesen Date: Fri, 28 Jun 2013 21:51:18 +0000 Subject: Fix a bad overflow check pointed out by Ben. llvm-svn: 185226 --- llvm/lib/Support/BlockFrequency.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Support/BlockFrequency.cpp') diff --git a/llvm/lib/Support/BlockFrequency.cpp b/llvm/lib/Support/BlockFrequency.cpp index 8de517fad64..5e45e46cf97 100644 --- a/llvm/lib/Support/BlockFrequency.cpp +++ b/llvm/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; } -- cgit v1.2.3