diff options
| -rw-r--r-- | libraries/base/GHC/List.hs | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/libraries/base/GHC/List.hs b/libraries/base/GHC/List.hs index 86ff868a08..bbaa0a2751 100644 --- a/libraries/base/GHC/List.hs +++ b/libraries/base/GHC/List.hs @@ -400,43 +400,27 @@ scanr1 f (x:xs) = f x q : qs -- It is a special case of 'Data.List.maximumBy', which allows the -- programmer to supply their own comparison function. maximum :: (Ord a) => [a] -> a -{-# INLINE [1] maximum #-} +{-# INLINEABLE maximum #-} maximum [] = errorEmptyList "maximum" maximum xs = foldl1 max xs -{-# RULES - "maximumInt" maximum = (strictMaximum :: [Int] -> Int); - "maximumInteger" maximum = (strictMaximum :: [Integer] -> Integer) - #-} - --- We can't make the overloaded version of maximum strict without --- changing its semantics (max might not be strict), but we can for --- the version specialised to 'Int'. -strictMaximum :: (Ord a) => [a] -> a -strictMaximum [] = errorEmptyList "maximum" -strictMaximum xs = foldl1' max xs -{-# SPECIALIZE strictMaximum :: [Int] -> Int #-} -{-# SPECIALIZE strictMaximum :: [Integer] -> Integer #-} +-- We want this to be specialized so that with a strict max function, GHC +-- produces good code. Note that to see if this is happending, one has to +-- look at -ddump-prep, not -ddump-core! +{-# SPECIALIZE maximum :: [Int] -> Int #-} +{-# SPECIALIZE maximum :: [Integer] -> Integer #-} -- | 'minimum' returns the minimum value from a list, -- which must be non-empty, finite, and of an ordered type. -- It is a special case of 'Data.List.minimumBy', which allows the -- programmer to supply their own comparison function. minimum :: (Ord a) => [a] -> a -{-# INLINE [1] minimum #-} +{-# INLINEABLE minimum #-} minimum [] = errorEmptyList "minimum" minimum xs = foldl1 min xs -{-# RULES - "minimumInt" minimum = (strictMinimum :: [Int] -> Int); - "minimumInteger" minimum = (strictMinimum :: [Integer] -> Integer) - #-} - -strictMinimum :: (Ord a) => [a] -> a -strictMinimum [] = errorEmptyList "minimum" -strictMinimum xs = foldl1' min xs -{-# SPECIALIZE strictMinimum :: [Int] -> Int #-} -{-# SPECIALIZE strictMinimum :: [Integer] -> Integer #-} +{-# SPECIALIZE minimum :: [Int] -> Int #-} +{-# SPECIALIZE minimum :: [Integer] -> Integer #-} -- | 'iterate' @f x@ returns an infinite list of repeated applications |