X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcRnMonad.lhs;fp=ghc%2Fcompiler%2Ftypecheck%2FTcRnMonad.lhs;h=86b2fbeaa137cbe291e9ae02534d4d7a13ab3d08;hb=0c53bd0e1b02dea0bde32cd7eb8ccb5ee2d3719e;hp=5fc329f784dd138274817f2e4ea48b12c4872d95;hpb=93e2d5bd8cc76fde85420c39aff50557ac62de97;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcRnMonad.lhs b/ghc/compiler/typecheck/TcRnMonad.lhs
index 5fc329f..86b2fbe 100644
--- a/ghc/compiler/typecheck/TcRnMonad.lhs
+++ b/ghc/compiler/typecheck/TcRnMonad.lhs
@@ -12,7 +12,8 @@ import IOEnv		-- Re-export all
 
 import HsSyn		( emptyLHsBinds )
 import HscTypes		( HscEnv(..), ModGuts(..), ModIface(..),
-			  TyThing, TypeEnv, emptyTypeEnv, HscSource(..), isHsBoot,
+			  TyThing, TypeEnv, emptyTypeEnv, HscSource(..),
+			  isHsBoot, ModSummary(..),
 			  ExternalPackageState(..), HomePackageTable,
 			  Deprecs(..), FixityEnv, FixItem, 
 			  lookupType, unQualInScope )
@@ -29,6 +30,7 @@ import VarEnv		( TidyEnv, emptyTidyEnv, emptyVarEnv )
 import ErrUtils		( Message, Messages, emptyMessages, errorsFound, 
 			  mkWarnMsg, printErrorsAndWarnings, pprBagOfErrors,
 			  mkLocMessage, mkLongErrMsg )
+import Packages		( mkHomeModules )
 import SrcLoc		( mkGeneralSrcSpan, isGoodSrcSpan, SrcSpan, Located(..) )
 import NameEnv		( emptyNameEnv )
 import NameSet		( NameSet, emptyDUs, emptyNameSet, unionNameSets, addOneToNameSet )
@@ -92,6 +94,7 @@ initTc hsc_env hsc_src mod do_this
 		tcg_th_used   = th_var,
 		tcg_exports  = emptyNameSet,
 		tcg_imports  = init_imports,
+		tcg_home_mods = home_mods,
 		tcg_dus      = emptyDUs,
 		tcg_rn_decls = Nothing,
 		tcg_binds    = emptyLHsBinds,
@@ -133,7 +136,17 @@ initTc hsc_env hsc_src mod do_this
 	return (msgs, final_res)
     }
   where
-    init_imports = emptyImportAvails { imp_env = unitModuleEnv mod emptyNameSet }
+    home_mods = mkHomeModules (map ms_mod (hsc_mod_graph hsc_env))
+	-- A guess at the home modules.  This will be correct in
+	-- --make and GHCi modes, but in one-shot mode we need to 
+	-- fix it up after we know the real dependencies of the current
+	-- module (see tcRnModule).
+	-- Setting it here is necessary for the typechecker entry points
+	-- other than tcRnModule: tcRnGetInfo, for example.  These are
+	-- all called via the GHC module, so hsc_mod_graph will contain
+	-- something sensible.
+
+    init_imports = emptyImportAvails {imp_env = unitModuleEnv mod emptyNameSet}
 	-- Initialise tcg_imports with an empty set of bindings for
 	-- this module, so that if we see 'module M' in the export
 	-- list, and there are no bindings in M, we don't bleat