projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More work on the simplifier's inlining strategies
[ghc-hetmet.git]
/
compiler
/
iface
/
BinIface.hs
diff --git
a/compiler/iface/BinIface.hs
b/compiler/iface/BinIface.hs
index
323e269
..
beb39c0
100644
(file)
--- a/
compiler/iface/BinIface.hs
+++ b/
compiler/iface/BinIface.hs
@@
-17,7
+17,7
@@
import TcRnMonad
import IfaceEnv
import HscTypes
import BasicTypes
import IfaceEnv
import HscTypes
import BasicTypes
-import NewDemand
+import Demand
import Annotations
import IfaceSyn
import Module
import Annotations
import IfaceSyn
import Module
@@
-335,7
+335,7
@@
data BinDictionary = BinDictionary {
{-! for StrictnessMark derive: Binary !-}
{-! for Activation derive: Binary !-}
{-! for StrictnessMark derive: Binary !-}
{-! for Activation derive: Binary !-}
--- NewDemand
+-- Demand
{-! for Demand derive: Binary !-}
{-! for Demands derive: Binary !-}
{-! for DmdResult derive: Binary !-}
{-! for Demand derive: Binary !-}
{-! for Demands derive: Binary !-}
{-! for DmdResult derive: Binary !-}
@@
-1161,8
+1161,9
@@
instance Binary IfaceInfoItem where
put_ bh (HsStrictness ab) = do
putByte bh 1
put_ bh ab
put_ bh (HsStrictness ab) = do
putByte bh 1
put_ bh ab
- put_ bh (HsUnfold ad) = do
+ put_ bh (HsUnfold lb ad) = do
putByte bh 2
putByte bh 2
+ put_ bh lb
put_ bh ad
put_ bh (HsInline ad) = do
putByte bh 3
put_ bh ad
put_ bh (HsInline ad) = do
putByte bh 3
@@
-1176,8
+1177,9
@@
instance Binary IfaceInfoItem where
return (HsArity aa)
1 -> do ab <- get bh
return (HsStrictness ab)
return (HsArity aa)
1 -> do ab <- get bh
return (HsStrictness ab)
- 2 -> do ad <- get bh
- return (HsUnfold ad)
+ 2 -> do lb <- get bh
+ ad <- get bh
+ return (HsUnfold lb ad)
3 -> do ad <- get bh
return (HsInline ad)
_ -> do return HsNoCafRefs
3 -> do ad <- get bh
return (HsInline ad)
_ -> do return HsNoCafRefs