Fix another bug in the clz patch that caused miscompilations when !gcc4

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22616 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/MathExtras.h b/include/llvm/Support/MathExtras.h
index 6cd44682fc0e94018bc33d7a1cb8293ddc41d427..8e7ad58efd06d80a3753b18e2240b50f93856709 100644 (file)
--- a/include/llvm/Support/MathExtras.h
+++ b/include/llvm/Support/MathExtras.h
@@ -142,12 +142,12 @@ inline unsigned CountLeadingZeros_64(uint64_t Value) {
     // if some bits in hi portion
     if (Hi) {
         // leading zeros in hi portion plus all bits in lo portion
-        Count = CountLeadingZeros_32(Hi) + 32;
+        Count = CountLeadingZeros_32(Hi);
     } else {
         // get lo portion
         unsigned Lo = Lo_32(Value);
         // same as 32 bit value
-        Count = CountLeadingZeros_32(Lo);
+        Count = CountLeadingZeros_32(Lo)+32;
     }
   }
 #endif