Move the [] definion from base to ghc-prim

[ghc-hetmet.git] / compiler / ghci / Debugger.hs

diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs
index b5347dc..e10b414 100644 (file)
--- a/compiler/ghci/Debugger.hs
+++ b/compiler/ghci/Debugger.hs
@@ -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