X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscTypes.lhs;h=00e1b4951d19c15cb98702243c53fe0ee5749a05;hb=1187e57fab2b5904a808ac973e5d04b91f880920;hp=20e84ab9f9dc351f732ba7a0d465ce12931e5744;hpb=a2da0796b273efd1fbb5d251fb748c627f189fa9;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/HscTypes.lhs b/ghc/compiler/main/HscTypes.lhs
index 20e84ab..00e1b49 100644
--- a/ghc/compiler/main/HscTypes.lhs
+++ b/ghc/compiler/main/HscTypes.lhs
@@ -84,6 +84,7 @@ import Type		( TyThing(..) )
 import Class		( Class, classSelIds, classTyCon )
 import TyCon		( TyCon, tyConSelIds, tyConDataCons )
 import DataCon		( dataConImplicitIds )
+import PrelNames	( gHC_PRIM )
 import Packages		( PackageIdH, PackageId, PackageConfig, HomeModules )
 import DynFlags		( DynFlags(..), isOneShot )
 import DriverPhases	( HscSource(..), isHsBoot, hscSourceString, Phase )
@@ -94,7 +95,7 @@ import IfaceSyn		( IfaceInst, IfaceRule, IfaceDecl(ifName) )
 
 import FiniteMap	( FiniteMap )
 import CoreSyn		( CoreRule )
-import Maybes		( orElse, fromJust, expectJust )
+import Maybes		( orElse, expectJust, expectJust )
 import Outputable
 import SrcLoc		( SrcSpan, Located )
 import UniqSupply	( UniqSupply )
@@ -275,9 +276,17 @@ hptRules hsc_env deps
     |	-- Find each non-hi-boot module below me
       (mod, False) <- deps
 
+	-- unsavoury: when compiling the base package with --make, we
+	-- sometimes try to look up RULES for GHC.Prim.  GHC.Prim won't
+	-- be in the HPT, because we never compile it; it's in the EPT
+	-- instead.  ToDo: clean up, and remove this slightly bogus
+	-- filter:
+    , mod /= gHC_PRIM
+
 	-- Look it up in the HPT
-    , let mod_info = ASSERT( mod `elemModuleEnv` hpt )
-		     fromJust (lookupModuleEnv hpt mod)
+    , let mod_info = case lookupModuleEnv hpt mod of
+		  	Nothing -> pprPanic "hptRules" (ppr mod <+> ppr deps)
+		  	Just x  -> x
 
 	-- And get its dfuns
     , rule <- md_rules (hm_details mod_info) ]
@@ -996,7 +1005,7 @@ showModMsg use_object mod_summary
 		    char ')'])
  where 
     mod     = ms_mod mod_summary 
-    mod_str = moduleUserString mod ++ hscSourceString (ms_hsc_src mod_summary)
+    mod_str = moduleString mod ++ hscSourceString (ms_hsc_src mod_summary)
 \end{code}