X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fghci%2FDebugger.hs;h=86331da887dc867e2ffdc0e48ae5b72fc2dd08e8;hb=6084fb5517da34f65034370a3695e2af3b85ce2b;hp=b5347dc1bbe0b8d1ec60b6357fafbc0f469e392f;hpb=ddb4c07d9b3bd50eb95edbf121745fb9c6306638;p=ghc-hetmet.git diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs index b5347dc..86331da 100644 --- a/compiler/ghci/Debugger.hs +++ b/compiler/ghci/Debugger.hs @@ -17,7 +17,7 @@ import RtClosureInspect import HscTypes import IdInfo ---import Id +import Id import Name import Var hiding ( varName ) import VarSet @@ -31,7 +31,7 @@ import Outputable import SrcLoc import PprTyThing -import Control.Exception +import Exception import Control.Monad import Data.List import Data.Maybe @@ -81,8 +81,9 @@ pprintClosureCommand session bindThings force str = do -- Then, we extract a substitution, -- mapping the old tyvars to the reconstructed types. let reconstructed_type = termType term - subst = unifyRTTI (idType id) (reconstructed_type) - return (term',subst) + mb_subst <- withSession cms $ \hsc_env -> + improveRTTIType hsc_env (idType id) (reconstructed_type) + return (term', fromMaybe emptyTvSubst mb_subst) tidyTermTyVars :: Session -> Term -> IO Term tidyTermTyVars (Session ref) t = do