X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fcompiler%2FcodeGen%2FClosureInfo.lhs;h=ae7cf40f2ceeeb911ec007fc3559a951a28cf53a;hp=f7eb45a53908ccea06d255fa7f708eaffe5b1d94;hb=f01a8e8c9c53bfb5ab3393ed3457ebf25390efa1;hpb=cc051dd76d01b61caae6f4e1fc177c9815716961 diff --git a/ghc/compiler/codeGen/ClosureInfo.lhs b/ghc/compiler/codeGen/ClosureInfo.lhs index f7eb45a..ae7cf40 100644 --- a/ghc/compiler/codeGen/ClosureInfo.lhs +++ b/ghc/compiler/codeGen/ClosureInfo.lhs @@ -92,7 +92,7 @@ import PprType ( GenType{-instance Outputable-} ) import PrimRep ( getPrimRepSize, separateByPtrFollowness ) import SMRep -- all of it import TyCon ( maybeTyConSingleCon, TyCon{-instance NamedThing-} ) -import Type ( isPrimType, splitForAllTy, splitFunTy, mkFunTys ) +import Type ( isPrimType, splitForAllTy, splitFunTyWithDictsAsArgs, mkFunTys ) import Util ( isIn, mapAccumL, panic, pprPanic, assertPanic ) maybeCharLikeTyCon = panic "ClosureInfo.maybeCharLikeTyCon (ToDo)" @@ -1163,7 +1163,7 @@ closureReturnsUnboxedType other_closure = False fun_result_ty arity id = let (_, de_foralld_ty) = splitForAllTy (idType id) - (arg_tys, res_ty) = splitFunTy{-w/ dicts as args?-} de_foralld_ty + (arg_tys, res_ty) = splitFunTyWithDictsAsArgs de_foralld_ty in ASSERT(arity >= 0 && length arg_tys >= arity) mkFunTys (drop arity arg_tys) res_ty