X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FRtClosureInspect.hs;h=d4487934193aaf7f9c0b3b60cf2a313d9af34e6f;hb=22b34988e2b156593d7cfc9b72d6cc0ab471a1d2;hp=beb7b58b358f1f4b631bcf7442a2b5086f56e0a7;hpb=6dd1836974634f9ef0bc417230deb5f757e1c618;p=ghc-hetmet.git diff --git a/compiler/ghci/RtClosureInspect.hs b/compiler/ghci/RtClosureInspect.hs index beb7b58..d448793 100644 --- a/compiler/ghci/RtClosureInspect.hs +++ b/compiler/ghci/RtClosureInspect.hs @@ -585,7 +585,7 @@ addConstraint actual expected = do recoverTR (traceTR $ fsep [text "Failed to unify", ppr actual, text "with", ppr expected]) (congruenceNewtypes actual expected >>= - uncurry boxyUnify >> return ()) + (getLIE . uncurry boxyUnify) >> return ()) -- TOMDO: what about the coercion? -- we should consider family instances @@ -842,7 +842,7 @@ improveRTTIType hsc_env _ty rtti_ty = runTR_maybe hsc_env $ do (ty_tvs, _, _) <- tcInstType return ty (ty_tvs', _, ty') <- tcInstType (mapM tcInstTyVar) ty (_, _, rtti_ty') <- tcInstType (mapM tcInstTyVar) (sigmaType rtti_ty) - boxyUnify rtti_ty' ty' + getLIE(boxyUnify rtti_ty' ty') tvs1_contents <- zonkTcTyVars ty_tvs' let subst = (uncurry zipTopTvSubst . unzip) [(tv,ty) | (tv,ty) <- zip ty_tvs tvs1_contents @@ -1178,4 +1178,4 @@ sizeofTyCon = primRepSizeW . tyConPrimRep (|.|) :: (a -> Bool) -> (a -> Bool) -> a -> Bool -(f |.| g) x = f x || g x \ No newline at end of file +(f |.| g) x = f x || g x