[PATCH] D67937: Fix int to bool errors exposed due to r372612

[Rumeet Dhindsa via Phabricator via llvm-commits]

rdhindsa created this revision.
rdhindsa added a reviewer: rupprecht.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Fix int to bool conversions exposed by r372612. ( Warn if '<<' in bool context with -Wint-in-bool-context (GCC compatibility))


Repository:
  rL LLVM

https://reviews.llvm.org/D67937

Files:
  compiler-rt/lib/builtins/fp_add_impl.inc
  compiler-rt/lib/builtins/fp_lib.h
  compiler-rt/lib/builtins/fp_trunc_impl.inc


Index: compiler-rt/lib/builtins/fp_trunc_impl.inc
===================================================================
--- compiler-rt/lib/builtins/fp_trunc_impl.inc
+++ compiler-rt/lib/builtins/fp_trunc_impl.inc
@@ -113,7 +113,7 @@
     if (shift > srcSigBits) {
       absResult = 0;
     } else {
-      const bool sticky = significand << (srcBits - shift);
+      const bool sticky = ((significand << (srcBits - shift)) != 0);
       src_rep_t denormalizedSignificand = significand >> shift | sticky;
       absResult = denormalizedSignificand >> (srcSigBits - dstSigBits);
       const src_rep_t roundBits = denormalizedSignificand & roundMask;
Index: compiler-rt/lib/builtins/fp_lib.h
===================================================================
--- compiler-rt/lib/builtins/fp_lib.h
+++ compiler-rt/lib/builtins/fp_lib.h
@@ -245,7 +245,7 @@
 static __inline void wideRightShiftWithSticky(rep_t *hi, rep_t *lo,
                                               unsigned int count) {
   if (count < typeWidth) {
-    const bool sticky = *lo << (typeWidth - count);
+    const bool sticky = ((*lo << (typeWidth - count)) != 0);
     *lo = *hi << (typeWidth - count) | *lo >> count | sticky;
     *hi = *hi >> count;
   } else if (count < 2 * typeWidth) {
Index: compiler-rt/lib/builtins/fp_add_impl.inc
===================================================================
--- compiler-rt/lib/builtins/fp_add_impl.inc
+++ compiler-rt/lib/builtins/fp_add_impl.inc
@@ -94,7 +94,7 @@
   const unsigned int align = aExponent - bExponent;
   if (align) {
     if (align < typeWidth) {
-      const bool sticky = bSignificand << (typeWidth - align);
+      const bool sticky = ((bSignificand << (typeWidth - align)) != 0);
       bSignificand = bSignificand >> align | sticky;
     } else {
       bSignificand = 1; // Set the sticky bit.  b is known to be non-zero.
@@ -133,7 +133,7 @@
     // The result is denormal before rounding.  The exponent is zero and we
     // need to shift the significand.
     const int shift = 1 - aExponent;
-    const bool sticky = aSignificand << (typeWidth - shift);
+    const bool sticky = ((aSignificand << (typeWidth - shift)) != 0);
     aSignificand = aSignificand >> shift | sticky;
     aExponent = 0;
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D67937.221425.patch
Type: text/x-patch
Size: 2250 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190923/ca1bbf26/attachment-0001.bin>