X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fiface%2FIfaceEnv.lhs;h=20d7327cfeb515a43d6b8436486860b6419e7e05;hp=4f04ed7db468b22eabf8701befecf7990c9195c2;hb=66579ff945831c5fc9a17c58c722ff01f2268d76;hpb=cf0109b382c08feb20425bcf22cc31240a762f74

diff --git a/compiler/iface/IfaceEnv.lhs b/compiler/iface/IfaceEnv.lhs
index 4f04ed7..20d7327 100644
--- a/compiler/iface/IfaceEnv.lhs
+++ b/compiler/iface/IfaceEnv.lhs
@@ -184,12 +184,17 @@ newIPName occ_name_ip = do
 	key = occ_name_ip	-- Ensures that ?x and %x get distinct Names
 \end{code}
 
-	Local helper functions (not exported)
+%************************************************************************
+%*									*
+		Name cache access
+%*									*
+%************************************************************************
 
 \begin{code}
 lookupOrigNameCache :: OrigNameCache -> Module -> OccName -> Maybe Name
 lookupOrigNameCache _ mod occ
-  | mod == dATA_TUP || mod == gHC_PRIM,		-- Boxed tuples from one, 
+  -- XXX Why is gHC_UNIT not mentioned here?
+  | mod == gHC_TUPLE || mod == gHC_PRIM,		-- Boxed tuples from one, 
     Just tup_info <- isTupleOcc_maybe occ	-- unboxed from the other
   = 	-- Special case for tuples; there are too many
 	-- of them to pre-populate the original-name cache
@@ -207,7 +212,8 @@ lookupOrigNameCache nc mod occ	-- The normal case
 
 extendOrigNameCache :: OrigNameCache -> Name -> OrigNameCache
 extendOrigNameCache nc name 
-  = extendNameCache nc (nameModule name) (nameOccName name) name
+  = ASSERT2( isExternalName name, ppr name ) 
+    extendNameCache nc (nameModule name) (nameOccName name) name
 
 extendNameCache :: OrigNameCache -> Module -> OccName -> Name -> OrigNameCache
 extendNameCache nc mod occ name