X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FBinIface.hs;h=9926b95d249f55b609c9dacd3e23fae21ab2adf7;hb=e06951a75a1f519e8f015880c363a8dedc08ff9c;hp=58ae603d55cf6f60371bc36205c03254071a7fb5;hpb=319a0b23c2cd8294c8d71d51e3ecb973afe3fd48;p=ghc-hetmet.git

diff --git a/compiler/iface/BinIface.hs b/compiler/iface/BinIface.hs
index 58ae603..9926b95 100644
--- a/compiler/iface/BinIface.hs
+++ b/compiler/iface/BinIface.hs
@@ -1,7 +1,11 @@
 
--- 
+{-# OPTIONS_GHC -O #-}
+-- We always optimise this, otherwise performance of a non-optimised
+-- compiler is severely affected
+
+--
 --  (c) The University of Glasgow 2002-2006
--- 
+--
 -- Binary interface file support.
 
 module BinIface ( writeBinIface, readBinIface,
@@ -14,6 +18,7 @@ import IfaceEnv
 import HscTypes
 import BasicTypes
 import NewDemand
+import Annotations
 import IfaceSyn
 import Module
 import Name
@@ -40,7 +45,6 @@ import Data.List
 import Data.Word
 import Data.Array
 import Data.IORef
-import Control.Exception
 import Control.Monad
 
 data CheckHiWay = CheckHiWay | IgnoreHiWay
@@ -78,7 +82,7 @@ readBinIface_ checkHiWay traceBinIFaceReading hi_path nc = do
       errorOnMismatch what wanted got
             -- This will be caught by readIface which will emit an error
             -- msg containing the iface module name.
-          = when (wanted /= got) $ throwDyn $ ProgramError
+          = when (wanted /= got) $ ghcError $ ProgramError
                         (what ++ " (wanted " ++ show wanted
                               ++ ", got "    ++ show got ++ ")")
   bh <- Binary.readBinMem hi_path
@@ -260,7 +264,7 @@ fromOnDiskName _ nc (pid, mod_name, occ) =
 
 serialiseName :: BinHandle -> Name -> UniqFM (Int,Name) -> IO ()
 serialiseName bh name _ = do
-  let mod = nameModule name
+  let mod = ASSERT2( isExternalName name, ppr name ) nameModule name
   put_ bh (modulePackageId mod, moduleName mod, nameOccName name)
 
 
@@ -369,7 +373,8 @@ instance Binary ModIface where
 		 mi_exports   = exports,
 		 mi_exp_hash  = exp_hash,
 		 mi_fixities  = fixities,
-		 mi_deprecs   = deprecs,
+		 mi_warns     = warns,
+		 mi_anns      = anns,
 		 mi_decls     = decls,
 		 mi_insts     = insts,
 		 mi_fam_insts = fam_insts,
@@ -388,7 +393,8 @@ instance Binary ModIface where
 	put_ bh exports
 	put_ bh exp_hash
 	put_ bh fixities
-	lazyPut bh deprecs
+	lazyPut bh warns
+	lazyPut bh anns
         put_ bh decls
 	put_ bh insts
 	put_ bh fam_insts
@@ -409,7 +415,8 @@ instance Binary ModIface where
 	exports	  <- {-# SCC "bin_exports" #-} get bh
 	exp_hash  <- get bh
 	fixities  <- {-# SCC "bin_fixities" #-} get bh
-	deprecs   <- {-# SCC "bin_deprecs" #-} lazyGet bh
+	warns     <- {-# SCC "bin_warns" #-} lazyGet bh
+	anns      <- {-# SCC "bin_anns" #-} lazyGet bh
         decls 	  <- {-# SCC "bin_tycldecls" #-} get bh
 	insts     <- {-# SCC "bin_insts" #-} get bh
 	fam_insts <- {-# SCC "bin_fam_insts" #-} get bh
@@ -428,8 +435,9 @@ instance Binary ModIface where
 		 mi_usages    = usages,
 		 mi_exports   = exports,
 		 mi_exp_hash  = exp_hash,
+		 mi_anns      = anns,
 		 mi_fixities  = fixities,
-		 mi_deprecs   = deprecs,
+		 mi_warns     = warns,
 		 mi_decls     = decls,
 		 mi_globals   = Nothing,
 		 mi_insts     = insts,
@@ -439,7 +447,7 @@ instance Binary ModIface where
                  mi_vect_info = vect_info,
 		 mi_hpc       = hpc_info,
 			-- And build the cached values
-		 mi_dep_fn    = mkIfaceDepCache deprecs,
+		 mi_warn_fn   = mkIfaceWarnCache warns,
 		 mi_fix_fn    = mkIfaceFixCache fixities,
 		 mi_hash_fn   = mkIfaceHashCache decls })
 
@@ -511,23 +519,39 @@ instance Binary Usage where
             return UsageHomeModule { usg_mod_name = nm, usg_mod_hash = mod,
                             usg_exports = exps, usg_entities = ents }
 
-instance Binary Deprecations where
-    put_ bh NoDeprecs     = putByte bh 0
-    put_ bh (DeprecAll t) = do
-	    putByte bh 1
-	    put_ bh t
-    put_ bh (DeprecSome ts) = do
-	    putByte bh 2
-	    put_ bh ts
+instance Binary Warnings where
+    put_ bh NoWarnings     = putByte bh 0
+    put_ bh (WarnAll t) = do
+            putByte bh 1
+            put_ bh t
+    put_ bh (WarnSome ts) = do
+            putByte bh 2
+            put_ bh ts
 
     get bh = do
-	    h <- getByte bh
-	    case h of
-	      0 -> return NoDeprecs
-	      1 -> do aa <- get bh
-		      return (DeprecAll aa)
-	      _ -> do aa <- get bh
-		      return (DeprecSome aa)
+            h <- getByte bh
+            case h of
+              0 -> return NoWarnings
+              1 -> do aa <- get bh
+                      return (WarnAll aa)
+              _ -> do aa <- get bh
+                      return (WarnSome aa)
+
+instance Binary WarningTxt where
+    put_ bh (WarningTxt w) = do
+            putByte bh 0
+            put_ bh w
+    put_ bh (DeprecatedTxt d) = do
+            putByte bh 1
+            put_ bh d
+
+    get bh = do
+            h <- getByte bh
+            case h of
+              0 -> do w <- get bh
+                      return (WarningTxt w)
+              _ -> do d <- get bh
+                      return (DeprecatedTxt d)
 
 -------------------------------------------------------------------------
 --		Types from: BasicTypes
@@ -1327,6 +1351,30 @@ instance Binary IfaceRule where
 	    a7 <- get bh
 	    return (IfaceRule a1 a2 a3 a4 a5 a6 a7)
 
+instance Binary IfaceAnnotation where
+    put_ bh (IfaceAnnotation a1 a2) = do
+        put_ bh a1
+        put_ bh a2
+    get bh = do
+        a1 <- get bh
+        a2 <- get bh
+        return (IfaceAnnotation a1 a2)
+
+instance Binary name => Binary (AnnTarget name) where
+    put_ bh (NamedTarget a) = do
+        putByte bh 0
+        put_ bh a
+    put_ bh (ModuleTarget a) = do
+        putByte bh 1
+        put_ bh a
+    get bh = do
+        h <- getByte bh
+        case h of
+          0 -> do a <- get bh
+                  return (NamedTarget a)
+          _ -> do a <- get bh
+                  return (ModuleTarget a)
+
 instance Binary IfaceVectInfo where
     put_ bh (IfaceVectInfo a1 a2 a3) = do
 	    put_ bh a1