commit 9f98420b9f8ab704b26b0f7152e59a813fdccddf
author Siva Chandra Reddy <sivachandra@google.com> Wed Aug 19 14:44:23 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Sun Aug 30 14:24:02 2020 -0700
tree 3ae5bb9e23f260f7187d1cd9c973ee2f1aa6b05c
parent ccdfd0bd05a8ad4d5eb945c9b208011d74f1005f

[libc][obvious] Fix x86 long double conversion to integer.

Fixes incorrectly constructed ceill tests.

GitOrigin-RevId: e2645488ca3b18dfb4f5cc8d7494a208f89e91a0

test/src/math/ceill_test.cpp

diff --git a/test/src/math/ceill_test.cpp b/test/src/math/ceill_test.cpp
index ad1e16b..c1a385f 100644
--- a/test/src/math/ceill_test.cpp
+++ b/test/src/math/ceill_test.cpp
@@ -47,25 +47,25 @@
 }
 
 TEST(CeillTest, Fractions) {
-  EXPECT_FP_EQ(0.0l, __llvm_libc::ceill(0.5l));
+  EXPECT_FP_EQ(1.0l, __llvm_libc::ceill(0.5l));
   EXPECT_FP_EQ(-0.0l, __llvm_libc::ceill(-0.5l));
-  EXPECT_FP_EQ(0.0l, __llvm_libc::ceill(0.115l));
+  EXPECT_FP_EQ(1.0l, __llvm_libc::ceill(0.115l));
   EXPECT_FP_EQ(-0.0l, __llvm_libc::ceill(-0.115l));
-  EXPECT_FP_EQ(0.0l, __llvm_libc::ceill(0.715l));
+  EXPECT_FP_EQ(1.0l, __llvm_libc::ceill(0.715l));
   EXPECT_FP_EQ(-0.0l, __llvm_libc::ceill(-0.715l));
-  EXPECT_FP_EQ(1.0l, __llvm_libc::ceill(1.3l));
+  EXPECT_FP_EQ(2.0l, __llvm_libc::ceill(1.3l));
   EXPECT_FP_EQ(-1.0l, __llvm_libc::ceill(-1.3l));
-  EXPECT_FP_EQ(1.0l, __llvm_libc::ceill(1.5l));
+  EXPECT_FP_EQ(2.0l, __llvm_libc::ceill(1.5l));
   EXPECT_FP_EQ(-1.0l, __llvm_libc::ceill(-1.5l));
-  EXPECT_FP_EQ(1.0l, __llvm_libc::ceill(1.75l));
+  EXPECT_FP_EQ(2.0l, __llvm_libc::ceill(1.75l));
   EXPECT_FP_EQ(-1.0l, __llvm_libc::ceill(-1.75l));
-  EXPECT_FP_EQ(10.0l, __llvm_libc::ceill(10.32l));
+  EXPECT_FP_EQ(11.0l, __llvm_libc::ceill(10.32l));
   EXPECT_FP_EQ(-10.0l, __llvm_libc::ceill(-10.32l));
-  EXPECT_FP_EQ(10.0l, __llvm_libc::ceill(10.65l));
+  EXPECT_FP_EQ(11.0l, __llvm_libc::ceill(10.65l));
   EXPECT_FP_EQ(-10.0l, __llvm_libc::ceill(-10.65l));
-  EXPECT_FP_EQ(1234.0l, __llvm_libc::ceill(1234.38l));
+  EXPECT_FP_EQ(1235.0l, __llvm_libc::ceill(1234.38l));
   EXPECT_FP_EQ(-1234.0l, __llvm_libc::ceill(-1234.38l));
-  EXPECT_FP_EQ(1234.0l, __llvm_libc::ceill(1234.96l));
+  EXPECT_FP_EQ(1235.0l, __llvm_libc::ceill(1234.96l));
   EXPECT_FP_EQ(-1234.0l, __llvm_libc::ceill(-1234.96l));
 }
 

utils/FPUtil/LongDoubleBitsX86.h

diff --git a/utils/FPUtil/LongDoubleBitsX86.h b/utils/FPUtil/LongDoubleBitsX86.h
index 4d64490..482c4de 100644
--- a/utils/FPUtil/LongDoubleBitsX86.h
+++ b/utils/FPUtil/LongDoubleBitsX86.h
@@ -96,8 +96,8 @@
     // there can be garbage bits in the padding. So, we zero the padding bits
     // in |result|.
     static constexpr UIntType mask =
-        (UIntType(1) << (sizeof(long double) -
-                         Padding<sizeof(uintptr_t)>::value / 8)) -
+        (UIntType(1) << (sizeof(long double) * 8 -
+                         Padding<sizeof(uintptr_t)>::value)) -
         1;
     return result & mask;
   }