X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcRnDriver.lhs;h=347d38b3ec18bcd4f85f65012743a810f8bff19e;hp=5f4b487103a11cbf05ad11de0f77c80c3f4cbb74;hb=2c1ea2cedb1a8034b0828e24b554a35f56bb8924;hpb=10cc302badc3704ed300f7517a52ecc8304c61e9 diff --git a/compiler/typecheck/TcRnDriver.lhs b/compiler/typecheck/TcRnDriver.lhs index 5f4b487..347d38b 100644 --- a/compiler/typecheck/TcRnDriver.lhs +++ b/compiler/typecheck/TcRnDriver.lhs @@ -64,7 +64,7 @@ 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 ) import NameSet @@ -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