[commit: ghc] master: Cleanups [ci skip] (9921f5b)
git at git.haskell.org
git at git.haskell.org
Fri Jun 1 12:10:52 UTC 2018
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/9921f5b0f04a5b7871a4852e4da368ea6a763ec3/ghc
>---------------------------------------------------------------
commit 9921f5b0f04a5b7871a4852e4da368ea6a763ec3
Author: Gabor Greif <ggreif at gmail.com>
Date: Fri Jun 1 13:16:24 2018 +0200
Cleanups [ci skip]
>---------------------------------------------------------------
9921f5b0f04a5b7871a4852e4da368ea6a763ec3
compiler/cmm/SMRep.hs | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/compiler/cmm/SMRep.hs b/compiler/cmm/SMRep.hs
index 9f8a49b..7436315 100644
--- a/compiler/cmm/SMRep.hs
+++ b/compiler/cmm/SMRep.hs
@@ -279,10 +279,10 @@ isConRep (HeapRep _ _ _ Constr{}) = True
isConRep _ = False
isThunkRep :: SMRep -> Bool
-isThunkRep (HeapRep _ _ _ Thunk{}) = True
+isThunkRep (HeapRep _ _ _ Thunk) = True
isThunkRep (HeapRep _ _ _ ThunkSelector{}) = True
-isThunkRep (HeapRep _ _ _ BlackHole{}) = True
-isThunkRep (HeapRep _ _ _ IndStatic{}) = True
+isThunkRep (HeapRep _ _ _ BlackHole) = True
+isThunkRep (HeapRep _ _ _ IndStatic) = True
isThunkRep _ = False
isFunRep :: SMRep -> Bool
@@ -386,10 +386,10 @@ heapClosureSizeW _ _ = panic "SMRep.heapClosureSize"
closureTypeHdrSize :: DynFlags -> ClosureTypeInfo -> WordOff
closureTypeHdrSize dflags ty = case ty of
- Thunk{} -> thunkHdrSize dflags
+ Thunk -> thunkHdrSize dflags
ThunkSelector{} -> thunkHdrSize dflags
- BlackHole{} -> thunkHdrSize dflags
- IndStatic{} -> thunkHdrSize dflags
+ BlackHole -> thunkHdrSize dflags
+ IndStatic -> thunkHdrSize dflags
_ -> fixedHdrSizeW dflags
-- All thunks use thunkHdrSize, even if they are non-updatable.
-- this is because we don't have separate closure types for
@@ -448,21 +448,19 @@ rtsClosureType rep
HeapRep False 0 2 Fun{} -> FUN_0_2
HeapRep False _ _ Fun{} -> FUN
- HeapRep False 1 0 Thunk{} -> THUNK_1_0
- HeapRep False 0 1 Thunk{} -> THUNK_0_1
- HeapRep False 2 0 Thunk{} -> THUNK_2_0
- HeapRep False 1 1 Thunk{} -> THUNK_1_1
- HeapRep False 0 2 Thunk{} -> THUNK_0_2
- HeapRep False _ _ Thunk{} -> THUNK
+ HeapRep False 1 0 Thunk -> THUNK_1_0
+ HeapRep False 0 1 Thunk -> THUNK_0_1
+ HeapRep False 2 0 Thunk -> THUNK_2_0
+ HeapRep False 1 1 Thunk -> THUNK_1_1
+ HeapRep False 0 2 Thunk -> THUNK_0_2
+ HeapRep False _ _ Thunk -> THUNK
HeapRep False _ _ ThunkSelector{} -> THUNK_SELECTOR
- HeapRep True _ _ Fun{} -> FUN_STATIC
- HeapRep True _ _ Thunk{} -> THUNK_STATIC
-
- HeapRep False _ _ BlackHole{} -> BLACKHOLE
-
- HeapRep False _ _ IndStatic{} -> IND_STATIC
+ HeapRep True _ _ Fun{} -> FUN_STATIC
+ HeapRep True _ _ Thunk -> THUNK_STATIC
+ HeapRep False _ _ BlackHole -> BLACKHOLE
+ HeapRep False _ _ IndStatic -> IND_STATIC
_ -> panic "rtsClosureType"
More information about the ghc-commits
mailing list