X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FMkIface.lhs;h=0d4d163ad9fd8859ab8cd4500625ec12d37c2180;hb=c8bee21ecc0952200e43ce353e6a660334a6f756;hp=0fc397283abc55966f4a284060389ad08c1e0a2d;hpb=fdf6c02f72fbcbad9982bf78473916c40dcaa5ec;p=ghc-hetmet.git

diff --git a/compiler/iface/MkIface.lhs b/compiler/iface/MkIface.lhs
index 0fc3972..0d4d163 100644
--- a/compiler/iface/MkIface.lhs
+++ b/compiler/iface/MkIface.lhs
@@ -257,11 +257,13 @@ mkIface hsc_env maybe_old_iface
 	; let	{ entities = typeEnvElts type_env ;
                   decls  = [ tyThingToIfaceDecl entity
 			   | entity <- entities,
-                             not (isImplicitTyThing entity
-                                  || isWiredInName (getName entity)) ]
-                        -- Don't put implicit Ids and class tycons in
-                        -- the interface file, Nor wired-in things; the
-                        -- compiler knows about them anyhow
+			     let name = getName entity,
+                             not (isImplicitTyThing entity),
+	                        -- No implicit Ids and class tycons in the interface file
+			     not (isWiredInName name),
+	                        -- Nor wired-in things; the compiler knows about them anyhow
+			     nameIsLocalOrFrom this_mod name  ]
+				-- Sigh: see Note [Root-main Id] in TcRnDriver
 
 		; fixities    = [(occ,fix) | FixItem occ fix _ <- nameEnvElts fix_env]
 		; deprecs     = mkIfaceDeprec src_deprecs
@@ -330,7 +332,6 @@ mkIface hsc_env maybe_old_iface
      deliberatelyOmitted x = panic ("Deliberately omitted: " ++ x)
      ifFamInstTcName = ifaceTyConName . ifFamInstTyCon
 
-					      
 -----------------------------
 writeIfaceFile :: DynFlags -> ModLocation -> ModIface -> IO ()
 writeIfaceFile dflags location new_iface
@@ -537,7 +538,7 @@ addVersionInfo ver_fn (Just old_iface@(ModIface {
 	where
 	  occ = ifName new_decl
 	  why = case lookupOccEnv eq_env occ of
-		    Just (EqBut names) -> sep [ppr occ <> colon, ptext SLIT("Free vars (only) changed:"),
+		    Just (EqBut names) -> sep [ppr occ <> colon, ptext SLIT("Free vars (only) changed:") <> ppr names,
 					      nest 2 (braces (fsep (map ppr (occSetElts 
 						(occs `intersectOccSet` changed_occs)))))]
                            where occs = mkOccSet (map nameOccName (nameSetToList names))