[Git][ghc/ghc][master] Avoid partial head and tail in ghc-heap; replace with total pattern-matching
Marge Bot (@marge-bot)
gitlab at gitlab.haskell.org
Fri Sep 16 18:00:18 UTC 2022
Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
c6e9b89a by Bodigrim at 2022-09-16T13:59:55-04:00
Avoid partial head and tail in ghc-heap; replace with total pattern-matching
- - - - -
2 changed files:
- libraries/ghc-heap/GHC/Exts/Heap.hs
- libraries/ghc-heap/GHC/Exts/Heap/Utils.hsc
Changes:
=====================================
libraries/ghc-heap/GHC/Exts/Heap.hs
=====================================
@@ -71,7 +71,6 @@ import GHC.Exts.Heap.Utils
import qualified GHC.Exts.Heap.FFIClosures as FFIClosures
import qualified GHC.Exts.Heap.ProfInfo.PeekProfInfo as PPI
-import Control.Monad
import Data.Bits
import Foreign
import GHC.Exts
@@ -221,135 +220,119 @@ getClosureDataFromHeapRepPrim getConDesc decodeCCS itbl heapRep pts = do
t | t >= THUNK && t <= THUNK_STATIC -> do
pure $ ThunkClosure itbl pts npts
- THUNK_SELECTOR -> do
- unless (length pts >= 1) $
- fail "Expected at least 1 ptr argument to THUNK_SELECTOR"
- pure $ SelectorClosure itbl (head pts)
+ THUNK_SELECTOR -> case pts of
+ [] -> fail "Expected at least 1 ptr argument to THUNK_SELECTOR"
+ hd : _ -> pure $ SelectorClosure itbl hd
t | t >= FUN && t <= FUN_STATIC -> do
pure $ FunClosure itbl pts npts
- AP -> do
- unless (length pts >= 1) $
- fail "Expected at least 1 ptr argument to AP"
- -- We expect at least the arity, n_args, and fun fields
- unless (length payloadWords >= 2) $
- fail "Expected at least 2 raw words to AP"
- let splitWord = payloadWords !! 0
- pure $ APClosure itbl
+ AP -> case pts of
+ [] -> fail "Expected at least 1 ptr argument to AP"
+ hd : tl -> case payloadWords of
+ -- We expect at least the arity, n_args, and fun fields
+ splitWord : _ : _ ->
+ pure $ APClosure itbl
#if defined(WORDS_BIGENDIAN)
- (fromIntegral $ shiftR splitWord (wORD_SIZE_IN_BITS `div` 2))
- (fromIntegral splitWord)
+ (fromIntegral $ shiftR splitWord (wORD_SIZE_IN_BITS `div` 2))
+ (fromIntegral splitWord)
#else
- (fromIntegral splitWord)
- (fromIntegral $ shiftR splitWord (wORD_SIZE_IN_BITS `div` 2))
+ (fromIntegral splitWord)
+ (fromIntegral $ shiftR splitWord (wORD_SIZE_IN_BITS `div` 2))
#endif
- (head pts) (tail pts)
-
- PAP -> do
- unless (length pts >= 1) $
- fail "Expected at least 1 ptr argument to PAP"
- -- We expect at least the arity, n_args, and fun fields
- unless (length payloadWords >= 2) $
- fail "Expected at least 2 raw words to PAP"
- let splitWord = payloadWords !! 0
- pure $ PAPClosure itbl
+ hd tl
+ _ -> fail "Expected at least 2 raw words to AP"
+
+ PAP -> case pts of
+ [] -> fail "Expected at least 1 ptr argument to PAP"
+ hd : tl -> case payloadWords of
+ -- We expect at least the arity, n_args, and fun fields
+ splitWord : _ : _ ->
+ pure $ PAPClosure itbl
#if defined(WORDS_BIGENDIAN)
- (fromIntegral $ shiftR splitWord (wORD_SIZE_IN_BITS `div` 2))
- (fromIntegral splitWord)
+ (fromIntegral $ shiftR splitWord (wORD_SIZE_IN_BITS `div` 2))
+ (fromIntegral splitWord)
#else
- (fromIntegral splitWord)
- (fromIntegral $ shiftR splitWord (wORD_SIZE_IN_BITS `div` 2))
+ (fromIntegral splitWord)
+ (fromIntegral $ shiftR splitWord (wORD_SIZE_IN_BITS `div` 2))
#endif
- (head pts) (tail pts)
-
- AP_STACK -> do
- unless (length pts >= 1) $
- fail "Expected at least 1 ptr argument to AP_STACK"
- pure $ APStackClosure itbl (head pts) (tail pts)
-
- IND -> do
- unless (length pts >= 1) $
- fail "Expected at least 1 ptr argument to IND"
- pure $ IndClosure itbl (head pts)
-
- IND_STATIC -> do
- unless (length pts >= 1) $
- fail "Expected at least 1 ptr argument to IND_STATIC"
- pure $ IndClosure itbl (head pts)
-
- BLACKHOLE -> do
- unless (length pts >= 1) $
- fail "Expected at least 1 ptr argument to BLACKHOLE"
- pure $ BlackholeClosure itbl (head pts)
-
- BCO -> do
- unless (length pts >= 3) $
- fail $ "Expected at least 3 ptr argument to BCO, found "
- ++ show (length pts)
- unless (length payloadWords >= 4) $
- fail $ "Expected at least 4 words to BCO, found "
- ++ show (length payloadWords)
- let splitWord = payloadWords !! 3
- pure $ BCOClosure itbl (pts !! 0) (pts !! 1) (pts !! 2)
+ hd tl
+ _ -> fail "Expected at least 2 raw words to PAP"
+
+ AP_STACK -> case pts of
+ [] -> fail "Expected at least 1 ptr argument to AP_STACK"
+ hd : tl -> pure $ APStackClosure itbl hd tl
+
+ IND -> case pts of
+ [] -> fail "Expected at least 1 ptr argument to IND"
+ hd : _ -> pure $ IndClosure itbl hd
+
+ IND_STATIC -> case pts of
+ [] -> fail "Expected at least 1 ptr argument to IND_STATIC"
+ hd : _ -> pure $ IndClosure itbl hd
+
+ BLACKHOLE -> case pts of
+ [] -> fail "Expected at least 1 ptr argument to BLACKHOLE"
+ hd : _ -> pure $ BlackholeClosure itbl hd
+
+ BCO -> case pts of
+ pts0 : pts1 : pts2 : _ -> case payloadWords of
+ _ : _ : _ : splitWord : payloadRest ->
+ pure $ BCOClosure itbl pts0 pts1 pts2
#if defined(WORDS_BIGENDIAN)
- (fromIntegral $ shiftR splitWord (wORD_SIZE_IN_BITS `div` 2))
- (fromIntegral splitWord)
+ (fromIntegral $ shiftR splitWord (wORD_SIZE_IN_BITS `div` 2))
+ (fromIntegral splitWord)
#else
- (fromIntegral splitWord)
- (fromIntegral $ shiftR splitWord (wORD_SIZE_IN_BITS `div` 2))
+ (fromIntegral splitWord)
+ (fromIntegral $ shiftR splitWord (wORD_SIZE_IN_BITS `div` 2))
#endif
- (drop 4 payloadWords)
+ payloadRest
+ _ -> fail $ "Expected at least 4 words to BCO, found "
+ ++ show (length payloadWords)
+ _ -> fail $ "Expected at least 3 ptr argument to BCO, found "
+ ++ show (length pts)
- ARR_WORDS -> do
- unless (length payloadWords >= 1) $
- fail $ "Expected at least 1 words to ARR_WORDS, found "
+ ARR_WORDS -> case payloadWords of
+ [] -> fail $ "Expected at least 1 words to ARR_WORDS, found "
++ show (length payloadWords)
- pure $ ArrWordsClosure itbl (head payloadWords) (tail payloadWords)
+ hd : tl -> pure $ ArrWordsClosure itbl hd tl
- t | t >= MUT_ARR_PTRS_CLEAN && t <= MUT_ARR_PTRS_FROZEN_CLEAN -> do
- unless (length payloadWords >= 2) $
- fail $ "Expected at least 2 words to MUT_ARR_PTRS_* "
+ t | t >= MUT_ARR_PTRS_CLEAN && t <= MUT_ARR_PTRS_FROZEN_CLEAN -> case payloadWords of
+ p0 : p1 : _ -> pure $ MutArrClosure itbl p0 p1 pts
+ _ -> fail $ "Expected at least 2 words to MUT_ARR_PTRS_* "
++ "found " ++ show (length payloadWords)
- pure $ MutArrClosure itbl (payloadWords !! 0) (payloadWords !! 1) pts
- t | t >= SMALL_MUT_ARR_PTRS_CLEAN && t <= SMALL_MUT_ARR_PTRS_FROZEN_CLEAN -> do
- unless (length payloadWords >= 1) $
- fail $ "Expected at least 1 word to SMALL_MUT_ARR_PTRS_* "
+ t | t >= SMALL_MUT_ARR_PTRS_CLEAN && t <= SMALL_MUT_ARR_PTRS_FROZEN_CLEAN -> case payloadWords of
+ [] -> fail $ "Expected at least 1 word to SMALL_MUT_ARR_PTRS_* "
++ "found " ++ show (length payloadWords)
- pure $ SmallMutArrClosure itbl (payloadWords !! 0) pts
+ hd : _ -> pure $ SmallMutArrClosure itbl hd pts
- t | t == MUT_VAR_CLEAN || t == MUT_VAR_DIRTY -> do
- unless (length pts >= 1) $
- fail $ "Expected at least 1 words to MUT_VAR, found "
+ t | t == MUT_VAR_CLEAN || t == MUT_VAR_DIRTY -> case pts of
+ [] -> fail $ "Expected at least 1 words to MUT_VAR, found "
++ show (length pts)
- pure $ MutVarClosure itbl (head pts)
+ hd : _ -> pure $ MutVarClosure itbl hd
- t | t == MVAR_CLEAN || t == MVAR_DIRTY -> do
- unless (length pts >= 3) $
- fail $ "Expected at least 3 ptrs to MVAR, found "
+ t | t == MVAR_CLEAN || t == MVAR_DIRTY -> case pts of
+ pts0 : pts1 : pts2 : _ -> pure $ MVarClosure itbl pts0 pts1 pts2
+ _ -> fail $ "Expected at least 3 ptrs to MVAR, found "
++ show (length pts)
- pure $ MVarClosure itbl (pts !! 0) (pts !! 1) (pts !! 2)
BLOCKING_QUEUE ->
pure $ OtherClosure itbl pts rawHeapWords
- -- pure $ BlockingQueueClosure itbl
- -- (pts !! 0) (pts !! 1) (pts !! 2) (pts !! 3)
- -- pure $ OtherClosure itbl pts rawHeapWords
- --
- WEAK -> do
- pure $ WeakClosure
+ WEAK -> case pts of
+ pts0 : pts1 : pts2 : pts3 : rest -> pure $ WeakClosure
{ info = itbl
- , cfinalizers = pts !! 0
- , key = pts !! 1
- , value = pts !! 2
- , finalizer = pts !! 3
- , weakLink = case drop 4 pts of
+ , cfinalizers = pts0
+ , key = pts1
+ , value = pts2
+ , finalizer = pts3
+ , weakLink = case rest of
[] -> Nothing
[p] -> Just p
- _ -> error $ "Expected 4 or 5 words in WEAK, found " ++ show (length pts)
+ _ -> error $ "Expected 4 or 5 words in WEAK, but found more: " ++ show (length pts)
}
+ _ -> error $ "Expected 4 or 5 words in WEAK, but found less: " ++ show (length pts)
TSO | ( u_lnk : u_gbl_lnk : tso_stack : u_trec : u_blk_ex : u_bq : other) <- pts
-> withArray rawHeapWords (\ptr -> do
fields <- FFIClosures.peekTSOFields decodeCCS ptr
=====================================
libraries/ghc-heap/GHC/Exts/Heap/Utils.hsc
=====================================
@@ -110,11 +110,7 @@ parse (Ptr addr) = if not . all (>0) . fmap length $ [p,m,occ]
(m, occ)
= (intercalate "." $ reverse modWords, occWord)
where
- (modWords, occWord) =
- if length rest1 < 1 -- XXXXXXXXx YUKX
- --then error "getConDescAddress:parse:length rest1 < 1"
- then parseModOcc [] []
- else parseModOcc [] (tail rest1)
+ (modWords, occWord) = parseModOcc [] (drop 1 rest1)
-- We only look for dots if str could start with a module name,
-- i.e. if it starts with an upper case character.
-- Otherwise we might think that "X.:->" is the module name in
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c6e9b89a8ad9bd155748fe177a23c8f4919d308f
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c6e9b89a8ad9bd155748fe177a23c8f4919d308f
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20220916/33053f65/attachment-0001.html>
More information about the ghc-commits
mailing list