X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHscTypes.lhs;h=41558079740a77ae315ba1dd6b0f132eecc26d51;hb=209686695e664bc148d4031f746425ffc2d2eecc;hp=4dc78941336440e9a0d83e8822f6e9d2d093a938;hpb=d5934bbb856aa0aa620c9b2e0fa51c90a1a5a048;p=ghc-hetmet.git

diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index 4dc7894..4155807 100644
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -51,7 +51,7 @@ module HscTypes (
 	GenAvailInfo(..), AvailInfo, RdrAvailInfo, 
 	IfaceExport,
 
-	Deprecations, DeprecTxt, lookupDeprec, plusDeprecs,
+	Deprecations, DeprecTxt, plusDeprecs,
 
 	PackageInstEnv, PackageRuleBase,
 
@@ -64,6 +64,7 @@ module HscTypes (
 
 #include "HsVersions.h"
 
+import Breakpoints      ( SiteNumber, Coord, noDbgSites )
 #ifdef GHCI
 import ByteCodeAsm	( CompiledByteCode )
 #endif
@@ -97,7 +98,7 @@ import BasicTypes	( Version, initialVersion, IPName,
 import IfaceSyn
 import FiniteMap	( FiniteMap )
 import CoreSyn		( CoreRule )
-import Maybes		( orElse, expectJust )
+import Maybes		( orElse, expectJust, catMaybes, seqMaybe )
 import Outputable
 import SrcLoc		( SrcSpan, Located )
 import UniqFM		( lookupUFM, eltsUFM, emptyUFM )
@@ -105,7 +106,6 @@ import UniqSupply	( UniqSupply )
 import FastString	( FastString )
 
 import StringBuffer	( StringBuffer )
-import Maybes           ( catMaybes, seqMaybe )
 
 import System.Time	( ClockTime )
 import Data.IORef	( IORef, readIORef )
@@ -210,9 +210,15 @@ data TargetId
 pprTarget :: Target -> SDoc
 pprTarget (Target id _) = pprTargetId id
 
+instance Outputable Target where
+    ppr = pprTarget
+
 pprTargetId (TargetModule m) = ppr m
 pprTargetId (TargetFile f _) = text f
 
+instance Outputable TargetId where
+    ppr = pprTargetId
+
 type HomePackageTable  = ModuleNameEnv HomeModInfo
 	-- Domain = modules in the home package
 	-- "home" package name cached here for convenience
@@ -296,12 +302,15 @@ hptRules hsc_env deps
     , mod /= moduleName gHC_PRIM
 
 	-- Look it up in the HPT
-    , let mod_info = case lookupUFM hpt mod of
-		  	Nothing -> pprPanic "hptRules" (ppr mod <+> ppr deps)
-		  	Just x  -> x
+    , let rules = case lookupUFM hpt mod of
+		    Just info -> md_rules (hm_details info)
+		    Nothing -> pprTrace "WARNING in hptRules" msg [] 
+	  msg = vcat [ptext SLIT("missing module") <+> ppr mod,
+		      ptext SLIT("Probable cause: out-of-date interface files")]
+			-- This really shouldn't happen, but see Trac #962
 
 	-- And get its dfuns
-    , rule <- md_rules (hm_details mod_info) ]
+    , rule <- rules ]
 \end{code}
 
 %************************************************************************
@@ -446,14 +455,16 @@ data ModDetails
         md_types     :: !TypeEnv,
         md_insts     :: ![Instance],	-- Dfun-ids for the instances in this module
         md_fam_insts :: ![FamInst],
-        md_rules     :: ![CoreRule]	-- Domain may include Ids from other modules
+        md_rules     :: ![CoreRule],	-- Domain may include Ids from other modules
+        md_dbg_sites     :: ![(SiteNumber, Coord)]     -- Breakpoint sites inserted by the renamer
      }
 
 emptyModDetails = ModDetails { md_types = emptyTypeEnv,
 			       md_exports = [],
 			       md_insts     = [],
 			       md_rules     = [],
-			       md_fam_insts = [] }
+			       md_fam_insts = [],
+                               md_dbg_sites = noDbgSites}
 
 -- A ModGuts is carried through the compiler, accumulating stuff as it goes
 -- There is only one ModGuts at any time, the one for the module
@@ -482,7 +493,8 @@ data ModGuts
         mg_rules     :: ![CoreRule],	 -- Rules from this module
 	mg_binds     :: ![CoreBind],	 -- Bindings for this module
 	mg_foreign   :: !ForeignStubs,
-	mg_hpc_info  :: !HpcInfo         -- info about coverage tick boxes
+	mg_hpc_info  :: !HpcInfo,        -- info about coverage tick boxes
+        mg_dbg_sites :: ![(SiteNumber, Coord)]     -- Bkpts inserted by the renamer
     }
 
 -- The ModGuts takes on several slightly different forms:
@@ -807,13 +819,6 @@ mkIfaceDepCache (DeprecSome pairs) = lookupOccEnv (mkOccEnv pairs) . nameOccName
 emptyIfaceDepCache :: Name -> Maybe DeprecTxt
 emptyIfaceDepCache n = Nothing
 
-lookupDeprec :: Deprecations -> Name -> Maybe DeprecTxt
-lookupDeprec NoDeprecs        name = Nothing
-lookupDeprec (DeprecAll  txt) name = Just txt
-lookupDeprec (DeprecSome env) name = case lookupNameEnv env name of
-					    Just (_, txt) -> Just txt
-					    Nothing	  -> Nothing
-
 plusDeprecs :: Deprecations -> Deprecations -> Deprecations
 plusDeprecs d NoDeprecs = d
 plusDeprecs NoDeprecs d = d