[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-private.hh |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 78d92e0f27e8b688efac014526ef5c4f1f53a58f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jun 6 15:24:43 2018 -0700

    Minorish

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 6c2b9979..4edb27cb 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -438,7 +438,7 @@ _hb_bit_storage (T v)
   if (sizeof (T) == 16)
   {
     unsigned int shift = 64;
-    return (v >> shift) ? _hb_bit_storage<uint64_t> ((uint64_t) v >> shift) + shift :
+    return (v >> shift) ? _hb_bit_storage<uint64_t> ((uint64_t) (v >> shift)) + shift :
 			  _hb_bit_storage<uint64_t> ((uint64_t) v);
   }
 
commit 676b19f0d1d21629b654e69f220bf53965735940
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jun 6 15:23:35 2018 -0700

    Compiler gymnastics
    
    Part of https://github.com/harfbuzz/harfbuzz/issues/630

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 76b7e55d..6c2b9979 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -369,6 +369,7 @@ _hb_popcount (T v)
   }
 
   assert (0);
+  return 0; /* Shut up stupid compiler. */
 }
 
 /* Returns the number of bits needed to store number */
@@ -442,6 +443,7 @@ _hb_bit_storage (T v)
   }
 
   assert (0);
+  return 0; /* Shut up stupid compiler. */
 }
 
 /* Returns the number of zero bits in the least significant side of v */
@@ -514,6 +516,7 @@ _hb_ctz (T v)
   }
 
   assert (0);
+  return 0; /* Shut up stupid compiler. */
 }
 
 static inline bool