X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=fc38fd541a94a945191793725dbbef77fccb63c6;hb=e8db8f8ea957807dc6d4f134a147ef60bfd0ee93;hp=5f4b487103a11cbf05ad11de0f77c80c3f4cbb74;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs
index 5f4b487..fc38fd5 100644
--- a/compiler/typecheck/TcRnDriver.lhs
+++ b/compiler/typecheck/TcRnDriver.lhs
@@ -64,9 +64,9 @@ import ErrUtils		( Messages, mkDumpDoc, showPass )
 import Id		( Id, mkExportedLocalId, isLocalId, idName, idType )
 import Var		( Var )
 import Module           ( Module, ModuleEnv, moduleEnvElts, elemModuleEnv )
-import OccName		( mkVarOccFS )
+import OccName		( mkVarOccFS, plusOccEnv )
 import Name		( Name, NamedThing(..), isExternalName, getSrcLoc, isWiredInName,
-			  mkExternalName, isInternalName )
+			  mkExternalName )
 import NameSet
 import TyCon		( tyConHasGenerics, isSynTyCon, synTyConDefn, tyConKind )
 import SrcLoc		( srcLocSpan, Located(..), noLoc )
@@ -114,7 +114,7 @@ import TysWiredIn	( mkListTy, unitTy )
 import IdInfo		( GlobalIdDetails(..) )
 import Kind		( Kind )
 import Var		( globaliseId )
-import Name		( nameOccName, nameModule, isBuiltInSyntax )
+import Name		( nameOccName, nameModule, isBuiltInSyntax, isInternalName )
 import OccName		( isTcOcc )
 import NameEnv		( delListFromNameEnv )
 import PrelNames	( iNTERACTIVE, ioTyConName, printName, itName, 
@@ -188,7 +188,7 @@ tcRnModule hsc_env hsc_src save_rn_syntax
 
 		-- Update the gbl env
 	updGblEnv ( \ gbl -> 
-		gbl { tcg_rdr_env  = rdr_env,
+		gbl { tcg_rdr_env  = plusOccEnv (tcg_rdr_env gbl) rdr_env,
 		      tcg_inst_env = extendInstEnvList (tcg_inst_env gbl) home_insts,
 		      tcg_imports  = tcg_imports gbl `plusImportAvails` imports,
                       tcg_rn_imports = if save_rn_syntax then