Rough matches for family instances

[ghc-hetmet.git] / compiler / iface / BinIface.hs

diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs
index 89e6500..3e9895a 100644 (file)
--- a/compiler/iface/BinIface.hs
+++ b/compiler/iface/BinIface.hs
@@ -18,11 +18,6 @@ import InstEnv               ( OverlapFlag(..) )
 import Class           ( DefMeth(..) )
 import CostCentre
 import StaticFlags     ( opt_HiVersion, v_Build_tag )
-import Type            ( Kind,
-                          isLiftedTypeKind, isUnliftedTypeKind, isOpenTypeKind,
-                         isArgTypeKind, isUbxTupleKind, liftedTypeKind,
-                         unliftedTypeKind, openTypeKind, argTypeKind,  
-                         ubxTupleKind, mkArrowKind, splitFunTy_maybe )
 import Panic
 import Binary
 import Util
@@ -109,6 +104,7 @@ instance Binary ModIface where
                 mi_deprecs   = deprecs,
                 mi_decls     = decls,
                 mi_insts     = insts,
+                mi_fam_insts = fam_insts,
                 mi_rules     = rules,
                 mi_rule_vers = rule_vers }) = do
        put_ bh (show opt_HiVersion)
@@ -126,6 +122,7 @@ instance Binary ModIface where
        lazyPut bh deprecs
         put_ bh decls
        put_ bh insts
+       put_ bh fam_insts
        lazyPut bh rules
        put_ bh rule_vers
 
@@ -161,6 +158,7 @@ instance Binary ModIface where
        deprecs   <- {-# SCC "bin_deprecs" #-} lazyGet bh
         decls    <- {-# SCC "bin_tycldecls" #-} get bh
        insts     <- {-# SCC "bin_insts" #-} get bh
+       fam_insts <- {-# SCC "bin_fam_insts" #-} get bh
        rules     <- {-# SCC "bin_rules" #-} lazyGet bh
        rule_vers <- get bh
        return (ModIface {
@@ -177,7 +175,7 @@ instance Binary ModIface where
                 mi_decls     = decls,
                 mi_globals   = Nothing,
                 mi_insts     = insts,
-                mi_fam_insts = mkIfaceFamInstsCache . map snd $ decls,
+                mi_fam_insts = fam_insts,
                 mi_rules     = rules,
                 mi_rule_vers = rule_vers,
                        -- And build the cached values
@@ -366,19 +364,9 @@ instance Binary Fixity where
          return (Fixity aa ab)
 
 instance (Binary name) => Binary (IPName name) where
-    put_ bh (Dupable aa) = do
-           putByte bh 0
-           put_ bh aa
-    put_ bh (Linear ab) = do
-           putByte bh 1
-           put_ bh ab
-    get bh = do
-           h <- getByte bh
-           case h of
-             0 -> do aa <- get bh
-                     return (Dupable aa)
-             _ -> do ab <- get bh
-                     return (Linear ab)
+    put_ bh (IPName aa) = put_ bh aa
+    get bh = do aa <- get bh
+               return (IPName aa)
 
 -------------------------------------------------------------------------
 --             Types from: Demand
@@ -978,12 +966,14 @@ instance Binary IfaceInst where
                return (IfaceInst cls tys dfun flag orph)
 
 instance Binary IfaceFamInst where
-    put_ bh (IfaceFamInst tycon tys) = do
-           put_ bh tycon
+    put_ bh (IfaceFamInst fam tys tycon) = do
+           put_ bh fam
            put_ bh tys
-    get bh = do tycon <- get bh
+           put_ bh tycon
+    get bh = do fam   <- get bh
                tys   <- get bh
-               return (IfaceFamInst tycon tys)
+               tycon <- get bh
+               return (IfaceFamInst fam tys tycon)
 
 instance Binary OverlapFlag where
     put_ bh NoOverlap  = putByte bh 0