X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRename.lhs;h=409abef3c9f3e2407da158b2faa11791c2c29fcd;hb=30cf375e0bc79a6b71074a5e0fd2ec393241a751;hp=47ed0fd245d2b62ee6f944e05796d8aec0c6e107;hpb=dabfa71f33eabc5a2d10959728f772aa016f1c84;p=ghc-hetmet.git

diff --git a/ghc/compiler/rename/Rename.lhs b/ghc/compiler/rename/Rename.lhs
index 47ed0fd..409abef 100644
--- a/ghc/compiler/rename/Rename.lhs
+++ b/ghc/compiler/rename/Rename.lhs
@@ -164,15 +164,9 @@ renameModule us input@(HsModule mod _ _ imports _ _ _ _ _ _ _ _ _ _)
 
         pair_orig rn = (origName rn, rn)
 
-	-- we must ensure that the definitions of things in the BuiltinKey
-	-- table which may be *required* by the typechecker etc are read.
-	-- We *hack* in a requirement for Ix.Ix here
-	-- (it's the one thing that doesn't come from Prelude.<blah>)
-
 	must_haves
-	  = (RnImplicitClass (mkBuiltinName ixClassKey SLIT("Ix") SLIT("Ix")))
-	  : [ name_fn (mkBuiltinName u pRELUDE str) 
-	    | (str, (u, name_fn)) <- fmToList b_keys,
+	  = [ name_fn (mkBuiltinName u mod str) 
+	    | ((str, mod), (u, name_fn)) <- fmToList b_keys,
 	      str `notElem` [ SLIT("main"), SLIT("mainPrimIO")] ]
     in
 --  ASSERT (isEmptyBag orig_occ_dups)