X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcIfaceSig.lhs;fp=ghc%2Fcompiler%2Ftypecheck%2FTcIfaceSig.lhs;h=15fba8a1b1051cd3ac906a5bb87ca11815acf2a4;hb=96ad3e939fdce9ba5c1cfee1900dc8006299b98d;hp=004d7b5784db60a19166a8d6525ac79800065443;hpb=73ac2f44193dcfe4cc56aab5b2910cf4edc24a18;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcIfaceSig.lhs b/ghc/compiler/typecheck/TcIfaceSig.lhs index 004d7b5..15fba8a 100644 --- a/ghc/compiler/typecheck/TcIfaceSig.lhs +++ b/ghc/compiler/typecheck/TcIfaceSig.lhs @@ -14,6 +14,7 @@ module TcIfaceSig ( tcInterfaceSigs, import HsSyn ( CoreDecl(..), TyClDecl(..), HsTupCon(..) ) import TcHsSyn ( TypecheckedCoreBind ) +import TcRnTypes import TcRnMonad import TcMonoType ( tcIfaceType, kcHsSigType ) import TcEnv ( RecTcGblEnv, tcExtendTyVarEnv, @@ -42,7 +43,7 @@ import Name ( Name ) import UniqSupply ( initUs_ ) import Outputable import Util ( zipWithEqual, dropList, equalLength ) -import HscTypes ( TyThing(..) ) +import HscTypes ( TyThing(..), typeEnvIds ) import CmdLineOpts ( DynFlag(..) ) \end{code} @@ -64,11 +65,7 @@ tcInterfaceSigs unf_env decls | IfaceSig {tcdName = name, tcdType = ty, tcdIdInfo = id_infos, tcdLoc =src_loc} <- decls] where - in_scope_vars = [] --- in_scope_vars = filter (nameIsLocalOrFrom mod . idName) (tcEnvIds unf_env) - -- Oops: using isLocalId instead can give a black hole - -- because it looks at the idinfo - + in_scope_vars = typeEnvIds (tcg_type_env unf_env) -- When we have hi-boot files, an unfolding might refer to -- something defined in this module, so we must build a -- suitable in-scope set. This thunk will only be poked