projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve fix to Trac #3007
[ghc-hetmet.git]
/
compiler
/
iface
/
BinIface.hs
diff --git
a/compiler/iface/BinIface.hs
b/compiler/iface/BinIface.hs
index
60647a6
..
15cefe8
100644
(file)
--- a/
compiler/iface/BinIface.hs
+++ b/
compiler/iface/BinIface.hs
@@
-22,9
+22,7
@@
import Annotations
import IfaceSyn
import Module
import Name
import IfaceSyn
import Module
import Name
-import OccName
import VarEnv
import VarEnv
-import InstEnv
import Class
import DynFlags
import UniqFM
import Class
import DynFlags
import UniqFM
@@
-149,7
+147,7
@@
writeBinIface dflags hi_path mod_iface = do
-- The version and way descriptor go next
put_ bh (show opt_HiVersion)
way_descr <- getWayDescr
-- The version and way descriptor go next
put_ bh (show opt_HiVersion)
way_descr <- getWayDescr
- put bh way_descr
+ put_ bh way_descr
-- Remember where the symbol table pointer will go
symtab_p_p <- tellBin bh
-- Remember where the symbol table pointer will go
symtab_p_p <- tellBin bh
@@
-208,7
+206,7
@@
initBinMemSize :: Int
initBinMemSize = 1024 * 1024
-- The *host* architecture version:
initBinMemSize = 1024 * 1024
-- The *host* architecture version:
-#include "MachDeps.h"
+#include "../includes/MachDeps.h"
binaryInterfaceMagic :: Word32
#if WORD_SIZE_IN_BITS == 32
binaryInterfaceMagic :: Word32
#if WORD_SIZE_IN_BITS == 32
@@
-681,7
+679,7
@@
instance (Binary name) => Binary (IPName name) where
instance Binary DmdType where
-- Ignore DmdEnv when spitting out the DmdType
instance Binary DmdType where
-- Ignore DmdEnv when spitting out the DmdType
- put bh (DmdType _ ds dr) = do p <- put bh ds; put bh dr; return (castBin p)
+ put bh (DmdType _ ds dr) = do p <- put bh ds; put_ bh dr; return (castBin p)
get bh = do ds <- get bh; dr <- get bh; return (DmdType emptyVarEnv ds dr)
instance Binary Demand where
get bh = do ds <- get bh; dr <- get bh; return (DmdType emptyVarEnv ds dr)
instance Binary Demand where