X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FBinIface.hs;h=f32049ee09688cb6c1540a2cb263028bc9de5c63;hb=4163e2a0d42200d184727892c965a59189992993;hp=d47398cb14c1503609e4d15a80c95854b1ac36bb;hpb=49c98d143c382a1341e1046f5ca00819a25691ba;p=ghc-hetmet.git

diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs
index d47398c..f32049e 100644
--- a/compiler/iface/BinIface.hs
+++ b/compiler/iface/BinIface.hs
@@ -62,10 +62,36 @@ readBinIface_ hi_path nc = do
 	throwDyn (ProgramError (
 	   "magic number mismatch: old/corrupt interface file?"))
 
+        -- Get the dictionary pointer.  We won't attempt to actually
+        -- read the dictionary until we've done the version checks below,
+        -- just in case this isn't a valid interface.  In retrospect the
+        -- version should have come before the dictionary pointer, but this
+        -- is the way it was done originally, and we can't change it now.
+  dict_p <- Binary.get bh	-- Get the dictionary ptr
+
+        -- Check the interface file version and ways.
+  check_ver  <- get bh
+  let our_ver = show opt_HiVersion
+  when (check_ver /= our_ver) $
+        -- This will be caught by readIface which will emit an error
+        -- msg containing the iface module name.
+    throwDyn (ProgramError (
+        "mismatched interface file versions: expected "
+        ++ our_ver ++ ", found " ++ check_ver))
+
+  check_way <- get bh
+  ignore_way <- readIORef v_IgnoreHiWay
+  way_descr <- getWayDescr
+  when (not ignore_way && check_way /= way_descr) $
+        -- This will be caught by readIface
+        -- which will emit an error msg containing the iface module name.
+     throwDyn (ProgramError (
+  	"mismatched interface file ways: expected "
+  	++ way_descr ++ ", found " ++ check_way))
+
 	-- Read the dictionary
 	-- The next word in the file is a pointer to where the dictionary is
 	-- (probably at the end of the file)
-  dict_p <- Binary.get bh	-- Get the dictionary ptr
   data_p <- tellBin bh		-- Remember where we are now
   seekBin bh dict_p
   dict <- getDictionary bh
@@ -95,6 +121,11 @@ writeBinIface dflags hi_path mod_iface = do
   dict_p_p <- tellBin bh
   put_ bh dict_p_p	-- Placeholder for ptr to dictionary
 
+        -- The version and way descriptor go next
+  put_ bh (show opt_HiVersion)
+  way_descr <- getWayDescr
+  put  bh way_descr
+
         -- Remember where the symbol table pointer will go
   symtab_p_p <- tellBin bh
   put_ bh symtab_p_p
@@ -251,6 +282,7 @@ instance Binary ModIface where
 		 mi_boot      = is_boot,
 		 mi_mod_vers  = mod_vers,
 		 mi_orphan    = orphan,
+		 mi_finsts    = hasFamInsts,
 		 mi_deps      = deps,
 		 mi_usages    = usages,
 		 mi_exports   = exports,
@@ -262,13 +294,11 @@ instance Binary ModIface where
 		 mi_fam_insts = fam_insts,
 		 mi_rules     = rules,
 		 mi_rule_vers = rule_vers }) = do
-	put_ bh (show opt_HiVersion)
-	way_descr <- getWayDescr
-	put  bh way_descr
 	put_ bh mod
 	put_ bh is_boot
 	put_ bh mod_vers
 	put_ bh orphan
+	put_ bh hasFamInsts
 	lazyPut bh deps
 	lazyPut bh usages
 	put_ bh exports
@@ -282,29 +312,11 @@ instance Binary ModIface where
 	put_ bh rule_vers
 
    get bh = do
-	check_ver  <- get bh
-	let our_ver = show opt_HiVersion
-        when (check_ver /= our_ver) $
-	   -- use userError because this will be caught by readIface
-	   -- which will emit an error msg containing the iface module name.
-	   throwDyn (ProgramError (
-		"mismatched interface file versions: expected "
-		++ our_ver ++ ", found " ++ check_ver))
-
-	check_way <- get bh
-        ignore_way <- readIORef v_IgnoreHiWay
-	way_descr <- getWayDescr
-        when (not ignore_way && check_way /= way_descr) $
-	   -- use userError because this will be caught by readIface
-	   -- which will emit an error msg containing the iface module name.
-	   throwDyn (ProgramError (
-		"mismatched interface file ways: expected "
-		++ way_descr ++ ", found " ++ check_way))
-
 	mod_name  <- get bh
 	is_boot   <- get bh
 	mod_vers  <- get bh
 	orphan    <- get bh
+	hasFamInsts <- get bh
 	deps	  <- lazyGet bh
 	usages	  <- {-# SCC "bin_usages" #-} lazyGet bh
 	exports	  <- {-# SCC "bin_exports" #-} get bh
@@ -321,6 +333,7 @@ instance Binary ModIface where
 		 mi_boot      = is_boot,
 		 mi_mod_vers  = mod_vers,
 		 mi_orphan    = orphan,
+		 mi_finsts    = hasFamInsts,
 		 mi_deps      = deps,
 		 mi_usages    = usages,
 		 mi_exports   = exports,
@@ -355,11 +368,14 @@ instance Binary Dependencies where
     put_ bh deps = do put_ bh (dep_mods deps)
 		      put_ bh (dep_pkgs deps)
 		      put_ bh (dep_orphs deps)
+		      put_ bh (dep_finsts deps)
 
     get bh = do ms <- get bh 
 		ps <- get bh
 		os <- get bh
-		return (Deps { dep_mods = ms, dep_pkgs = ps, dep_orphs = os })
+		fis <- get bh
+		return (Deps { dep_mods = ms, dep_pkgs = ps, dep_orphs = os,
+			       dep_finsts = fis })
 
 instance (Binary name) => Binary (GenAvailInfo name) where
     put_ bh (Avail aa) = do
@@ -1004,7 +1020,6 @@ instance Binary IfaceNote where
               4 -> do ac <- get bh
                       return (IfaceCoreNote ac)
 
-
 -------------------------------------------------------------------------
 --		IfaceDecl and friends
 -------------------------------------------------------------------------