diff options
author | Ben Gamari <ben@smart-cactus.org> | 2019-01-30 10:05:19 -0500 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2019-01-30 10:05:19 -0500 |
commit | 172a59335fa6c76b17fb6795e87fbc7fcfd198e6 (patch) | |
tree | 6e5e940cb2c6ae9110807fa0d637a280c63b4220 /libraries/base/Data | |
parent | 76c8fd674435a652c75a96c85abbf26f1f221876 (diff) | |
download | haskell-172a59335fa6c76b17fb6795e87fbc7fcfd198e6.tar.gz |
Revert "Batch merge"
This reverts commit 76c8fd674435a652c75a96c85abbf26f1f221876.
Diffstat (limited to 'libraries/base/Data')
-rw-r--r-- | libraries/base/Data/Bits.hs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libraries/base/Data/Bits.hs b/libraries/base/Data/Bits.hs index 69446f9adc..000e663b83 100644 --- a/libraries/base/Data/Bits.hs +++ b/libraries/base/Data/Bits.hs @@ -438,9 +438,6 @@ instance Bits Int where {-# INLINE shift #-} {-# INLINE bit #-} {-# INLINE testBit #-} - -- We want popCnt# to be inlined in user code so that `ghc -msse4.2` - -- can compile it down to a popcnt instruction without an extra function call - {-# INLINE popCount #-} zeroBits = 0 @@ -481,16 +478,13 @@ instance Bits Int where instance FiniteBits Int where finiteBitSize _ = WORD_SIZE_IN_BITS countLeadingZeros (I# x#) = I# (word2Int# (clz# (int2Word# x#))) - {-# INLINE countLeadingZeros #-} countTrailingZeros (I# x#) = I# (word2Int# (ctz# (int2Word# x#))) - {-# INLINE countTrailingZeros #-} -- | @since 2.01 instance Bits Word where {-# INLINE shift #-} {-# INLINE bit #-} {-# INLINE testBit #-} - {-# INLINE popCount #-} (W# x#) .&. (W# y#) = W# (x# `and#` y#) (W# x#) .|. (W# y#) = W# (x# `or#` y#) @@ -525,9 +519,7 @@ instance Bits Word where instance FiniteBits Word where finiteBitSize _ = WORD_SIZE_IN_BITS countLeadingZeros (W# x#) = I# (word2Int# (clz# x#)) - {-# INLINE countLeadingZeros #-} countTrailingZeros (W# x#) = I# (word2Int# (ctz# x#)) - {-# INLINE countTrailingZeros #-} -- | @since 2.01 instance Bits Integer where |