X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcBinds.lhs;h=7890091ff1e90628a8dd181bfef8cd4464c2f5fe;hb=9ecd4031627be89cfe92d80b8a96e6b44a06aeec;hp=1e76698f9b833911721a2a3fde81e6b04e4ccefa;hpb=bb7ffa1642e2110e26e1243c42a8a24adafa985d;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcBinds.lhs b/compiler/typecheck/TcBinds.lhs index 1e76698..7890091 100644 --- a/compiler/typecheck/TcBinds.lhs +++ b/compiler/typecheck/TcBinds.lhs @@ -31,8 +31,7 @@ import Coercion import VarEnv import TysPrim import Id -import IdInfo -import Var hiding (mkLocalId) +import Var import Name import NameSet import NameEnv @@ -103,7 +102,7 @@ tcHsBootSigs (ValBindsOut binds sigs) where tc_boot_sig (TypeSig (L _ name) ty) = do { sigma_ty <- tcHsSigType (FunSigCtxt name) ty - ; return (mkVanillaGlobal name sigma_ty vanillaIdInfo) } + ; return (mkVanillaGlobal name sigma_ty) } -- Notice that we make GlobalIds, not LocalIds tc_boot_sig s = pprPanic "tcHsBootSigs/tc_boot_sig" (ppr s) tcHsBootSigs groups = pprPanic "tcHsBootSigs" (ppr groups) @@ -218,7 +217,7 @@ tc_group poly_rec top_lvl sig_fn prag_fn (Recursive, binds) thing_inside -- group at once; an earlier one may use a later one! do { traceTc (text "tc_group rec" <+> pprLHsBinds binds) ; (binds1,thing) <- bindLocalInsts top_lvl $ - go (stronglyConnComp (mkEdges sig_fn binds)) + go (stronglyConnCompFromEdgedVertices (mkEdges sig_fn binds)) ; return ([(Recursive, unionManyBags binds1)], thing) } -- Rec them all together where