X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FInteractiveEval.hs;h=7014d28122674a4f4351e4d1e74da8c585117d13;hp=ace2a7f410219983919d5f6d710bc4949c2f1f97;hb=d51f42f602bf9a6d1b356c41228a534c88723f65;hpb=a8984a8784090c853a27e832f31e8dd157d01216 diff --git a/compiler/main/InteractiveEval.hs b/compiler/main/InteractiveEval.hs index ace2a7f..7014d28 100644 --- a/compiler/main/InteractiveEval.hs +++ b/compiler/main/InteractiveEval.hs @@ -67,7 +67,7 @@ import Unique import UniqSupply import Module import Panic -import UniqFM +import LazyUniqFM import Maybes import ErrUtils import Util @@ -610,7 +610,7 @@ rttiEnvironment hsc_env@HscEnv{hsc_IC=ic} = do tys <- reconstructType hsc_env 10 `mapM` incompletelyTypedIds -- map termType `fmap` (obtainTerm hsc_env False `mapM` incompletelyTypedIds) - let substs = [computeRTTIsubst ty ty' + let substs = [unifyRTTI ty ty' | (ty, Just ty') <- zip (map idType incompletelyTypedIds) tys] ic' = foldr (flip substInteractiveContext) ic (map skolemiseSubst substs)