X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FRtClosureInspect.hs;h=de672a1270c5ec05b02d5bfc7aba17ba96c5bdc1;hb=463f566a6504f193e4602299be5f2400ca10d21a;hp=4f9588f6db99df5b962ea04490b7fb3fe26a11a9;hpb=30ad291abbe718ff9f96469d8c86be0eee55d50c;p=ghc-hetmet.git diff --git a/compiler/ghci/RtClosureInspect.hs b/compiler/ghci/RtClosureInspect.hs index 4f9588f..de672a1 100644 --- a/compiler/ghci/RtClosureInspect.hs +++ b/compiler/ghci/RtClosureInspect.hs @@ -14,6 +14,7 @@ module RtClosureInspect( isTerm, isSuspension, isPrim, + isNewtypeWrap, pprTerm, cPprTerm, cPprTermBase, @@ -30,7 +31,7 @@ module RtClosureInspect( termTyVars, -- unsafeDeepSeq, cvReconstructType, - computeRTTIsubst, + unifyRTTI, sigmaType, Closure(..), getClosureData, @@ -69,11 +70,11 @@ import TysWiredIn import Constants import Outputable -import Maybes import Panic import GHC.Arr ( Array(..) ) import GHC.Exts +import GHC.IOBase import Control.Monad import Data.Maybe @@ -112,13 +113,15 @@ data Term = Term { ty :: Type , value :: [Word] } | Suspension { ctype :: ClosureType - , mb_ty :: Maybe Type + , ty :: Type , val :: HValue , bound_to :: Maybe Name -- Useful for printing } | NewtypeWrap{ ty :: Type , dc :: Either String DataCon , wrapped_term :: Term } + | RefWrap { ty :: Type + , wrapped_term :: Term } isTerm, isSuspension, isPrim, isNewtypeWrap :: Term -> Bool isTerm Term{} = True @@ -130,18 +133,19 @@ isPrim _ = False isNewtypeWrap NewtypeWrap{} = True isNewtypeWrap _ = False -termType :: Term -> Maybe Type -termType t@(Suspension {}) = mb_ty t -termType t = Just$ ty t +termType :: Term -> Type +termType t = ty t isFullyEvaluatedTerm :: Term -> Bool isFullyEvaluatedTerm Term {subTerms=tt} = all isFullyEvaluatedTerm tt isFullyEvaluatedTerm Prim {} = True isFullyEvaluatedTerm NewtypeWrap{wrapped_term=t} = isFullyEvaluatedTerm t +isFullyEvaluatedTerm RefWrap{wrapped_term=t} = isFullyEvaluatedTerm t isFullyEvaluatedTerm _ = False instance Outputable (Term) where - ppr = head . cPprTerm cPprTermBase + ppr t | Just doc <- cPprTerm cPprTermBase t = doc + | otherwise = panic "Outputable Term instance" ------------------------------------------------------------------------- -- Runtime Closure Datatype and functions for retrieving closure related stuff @@ -154,7 +158,8 @@ data ClosureType = Constr | AP | PAP | Indirection Int - | Other Int + | MutVar Int + | Other Int deriving (Show, Eq) data Closure = Closure { tipe :: ClosureType @@ -198,18 +203,20 @@ getClosureData a = return (Closure tipe (Ptr iptr) itbl ptrsList nptrs_data) readCType :: Integral a => a -> ClosureType -readCType i +readCType i | i >= CONSTR && i <= CONSTR_NOCAF_STATIC = Constr | i >= FUN && i <= FUN_STATIC = Fun - | i >= THUNK && i < THUNK_SELECTOR = Thunk (fromIntegral i) + | i >= THUNK && i < THUNK_SELECTOR = Thunk i' | i == THUNK_SELECTOR = ThunkSelector | i == BLACKHOLE = Blackhole - | i >= IND && i <= IND_STATIC = Indirection (fromIntegral i) - | fromIntegral i == aP_CODE = AP + | i >= IND && i <= IND_STATIC = Indirection i' + | i' == aP_CODE = AP | i == AP_STACK = AP - | fromIntegral i == pAP_CODE = PAP - | otherwise = Other (fromIntegral i) - + | i' == pAP_CODE = PAP + | i == MUT_VAR_CLEAN || i == MUT_VAR_DIRTY = MutVar i' + | otherwise = Other i' + where i' = fromIntegral i + isConstr, isIndirection, isThunk :: ClosureType -> Bool isConstr Constr = True isConstr _ = False @@ -273,12 +280,13 @@ sizeofTyCon = sizeofPrimRep . tyConPrimRep ----------------------------------- type TermProcessor a b = Type -> Either String DataCon -> HValue -> [a] -> b -data TermFold a = TermFold { fTerm :: TermProcessor a a - , fPrim :: Type -> [Word] -> a - , fSuspension :: ClosureType -> Maybe Type -> HValue - -> Maybe Name -> a +data TermFold a = TermFold { fTerm :: TermProcessor a a + , fPrim :: Type -> [Word] -> a + , fSuspension :: ClosureType -> Type -> HValue + -> Maybe Name -> a , fNewtypeWrap :: Type -> Either String DataCon -> a -> a + , fRefWrap :: Type -> a -> a } foldTerm :: TermFold a -> Term -> a @@ -286,86 +294,105 @@ foldTerm tf (Term ty dc v tt) = fTerm tf ty dc v (map (foldTerm tf) tt) foldTerm tf (Prim ty v ) = fPrim tf ty v foldTerm tf (Suspension ct ty v b) = fSuspension tf ct ty v b foldTerm tf (NewtypeWrap ty dc t) = fNewtypeWrap tf ty dc (foldTerm tf t) +foldTerm tf (RefWrap ty t) = fRefWrap tf ty (foldTerm tf t) idTermFold :: TermFold Term idTermFold = TermFold { fTerm = Term, fPrim = Prim, fSuspension = Suspension, - fNewtypeWrap = NewtypeWrap + fNewtypeWrap = NewtypeWrap, + fRefWrap = RefWrap } idTermFoldM :: Monad m => TermFold (m Term) idTermFoldM = TermFold { fTerm = \ty dc v tt -> sequence tt >>= return . Term ty dc v, fPrim = (return.). Prim, fSuspension = (((return.).).). Suspension, - fNewtypeWrap= \ty dc t -> NewtypeWrap ty dc `liftM` t + fNewtypeWrap= \ty dc t -> NewtypeWrap ty dc `liftM` t, + fRefWrap = \ty t -> RefWrap ty `liftM` t } mapTermType :: (Type -> Type) -> Term -> Term mapTermType f = foldTerm idTermFold { fTerm = \ty dc hval tt -> Term (f ty) dc hval tt, - fSuspension = \ct mb_ty hval n -> - Suspension ct (fmap f mb_ty) hval n, - fNewtypeWrap= \ty dc t -> NewtypeWrap (f ty) dc t} + fSuspension = \ct ty hval n -> + Suspension ct (f ty) hval n, + fNewtypeWrap= \ty dc t -> NewtypeWrap (f ty) dc t, + fRefWrap = \ty t -> RefWrap (f ty) t} termTyVars :: Term -> TyVarSet termTyVars = foldTerm TermFold { fTerm = \ty _ _ tt -> tyVarsOfType ty `plusVarEnv` concatVarEnv tt, - fSuspension = \_ mb_ty _ _ -> - maybe emptyVarEnv tyVarsOfType mb_ty, + fSuspension = \_ ty _ _ -> tyVarsOfType ty, fPrim = \ _ _ -> emptyVarEnv, - fNewtypeWrap= \ty _ t -> tyVarsOfType ty `plusVarEnv` t} + fNewtypeWrap= \ty _ t -> tyVarsOfType ty `plusVarEnv` t, + fRefWrap = \ty t -> tyVarsOfType ty `plusVarEnv` t} where concatVarEnv = foldr plusVarEnv emptyVarEnv ---------------------------------- -- Pretty printing of terms ---------------------------------- -app_prec,cons_prec ::Int -app_prec = 10 +type Precedence = Int +type TermPrinter = Precedence -> Term -> SDoc +type TermPrinterM m = Precedence -> Term -> m SDoc + +app_prec,cons_prec, max_prec ::Int +max_prec = 10 +app_prec = max_prec cons_prec = 5 -- TODO Extract this info from GHC itself -pprTerm :: (Int -> Term -> Maybe SDoc) -> Int -> Term -> SDoc -pprTerm y p t | Just doc <- pprTermM y p t = doc +pprTerm :: TermPrinter -> TermPrinter +pprTerm y p t | Just doc <- pprTermM (\p -> Just . y p) p t = doc pprTerm _ _ _ = panic "pprTerm" -pprTermM, pprNewtypeWrap :: Monad m => - (Int -> Term -> m SDoc) -> Int -> Term -> m SDoc -pprTermM y p Term{dc=Left dc_tag, subTerms=tt} = do +pprTermM, ppr_termM, pprNewtypeWrap :: Monad m => TermPrinterM m -> TermPrinterM m +pprTermM y p t = pprDeeper `liftM` ppr_termM y p t + +ppr_termM y p Term{dc=Left dc_tag, subTerms=tt} = do tt_docs <- mapM (y app_prec) tt - return$ cparen (not(null tt) && p >= app_prec) (text dc_tag <+> sep tt_docs) + return$ cparen (not(null tt) && p >= app_prec) (text dc_tag <+> pprDeeperList fsep tt_docs) -pprTermM y p Term{dc=Right dc, subTerms=tt} +ppr_termM y p Term{dc=Right dc, subTerms=tt} {- | dataConIsInfix dc, (t1:t2:tt') <- tt --TODO fixity - = parens (pprTerm1 True t1 <+> ppr dc <+> pprTerm1 True ppr t2) - <+> hsep (map (pprTerm1 True) tt) + = parens (ppr_term1 True t1 <+> ppr dc <+> ppr_term1 True ppr t2) + <+> hsep (map (ppr_term1 True) tt) -} -- TODO Printing infix constructors properly | null tt = return$ ppr dc | otherwise = do tt_docs <- mapM (y app_prec) tt - return$ cparen (p >= app_prec) (ppr dc <+> sep tt_docs) - -pprTermM y p t@NewtypeWrap{} = pprNewtypeWrap y p t - -pprTermM _ _ t = pprTermM1 t - -pprTermM1 :: Monad m => Term -> m SDoc -pprTermM1 Prim{value=words, ty=ty} = + return$ cparen (p >= app_prec) (ppr dc <+> pprDeeperList fsep tt_docs) + +ppr_termM y p t@NewtypeWrap{} = pprNewtypeWrap y p t +ppr_termM y p RefWrap{wrapped_term=t} = do + contents <- y app_prec t + return$ cparen (p >= app_prec) (text "GHC.Prim.MutVar#" <+> contents) + -- The constructor name is wired in here ^^^ for the sake of simplicity. + -- I don't think mutvars are going to change in a near future. + -- In any case this is solely a presentation matter: MutVar# is + -- a datatype with no constructors, implemented by the RTS + -- (hence there is no way to obtain a datacon and print it). +ppr_termM _ _ t = ppr_termM1 t + + +ppr_termM1 :: Monad m => Term -> m SDoc +ppr_termM1 Prim{value=words, ty=ty} = return$ text$ repPrim (tyConAppTyCon ty) words -pprTermM1 Term{} = panic "pprTermM1 - unreachable" -pprTermM1 Suspension{bound_to=Nothing} = return$ char '_' -pprTermM1 Suspension{mb_ty=Just ty, bound_to=Just n} +ppr_termM1 Suspension{bound_to=Nothing} = return$ char '_' +ppr_termM1 Suspension{ty=ty, bound_to=Just n} | Just _ <- splitFunTy_maybe ty = return$ ptext SLIT("") - | otherwise = return$ parens$ ppr n <> text "::" <> ppr ty -pprTermM1 _ = panic "pprTermM1" + | otherwise = return$ parens$ ppr n <> text "::" <> ppr ty +ppr_termM1 Term{} = panic "ppr_termM1 - Term" +ppr_termM1 RefWrap{} = panic "ppr_termM1 - RefWrap" +ppr_termM1 NewtypeWrap{} = panic "ppr_termM1 - NewtypeWrap" pprNewtypeWrap y p NewtypeWrap{ty=ty, wrapped_term=t} | Just (tc,_) <- splitNewTyConApp_maybe ty , ASSERT(isNewTyCon tc) True , Just new_dc <- maybeTyConSingleCon tc = do - real_term <- y 10 t + real_term <- y max_prec t return$ cparen (p >= app_prec) (ppr new_dc <+> real_term) pprNewtypeWrap _ _ _ = panic "pprNewtypeWrap" @@ -382,27 +409,19 @@ pprNewtypeWrap _ _ _ = panic "pprNewtypeWrap" -- which I didn't. Therefore, this code replicates a lot -- of what type classes provide for free. --- Concretely a custom term printer takes an explicit --- recursion knot, and produces a list of Term Processors, --- which additionally need a precedence value to --- either produce a SDoc or fail (and they do this in some monad m). - -type Precedence = Int -type RecursionKnot m = Precedence -> Term -> m SDoc -type CustomTermPrinter m = RecursionKnot m +type CustomTermPrinter m = TermPrinterM m -> [Precedence -> Term -> (m (Maybe SDoc))] --- Takes a list of custom printers with a explicit recursion knot and a term, +-- | Takes a list of custom printers with a explicit recursion knot and a term, -- and returns the output of the first succesful printer, or the default printer cPprTerm :: Monad m => CustomTermPrinter m -> Term -> m SDoc cPprTerm printers_ = go 0 where printers = printers_ go - go prec t | isTerm t || isNewtypeWrap t = do + go prec t = do let default_ = Just `liftM` pprTermM go prec t mb_customDocs = [pp prec t | pp <- printers] ++ [default_] Just doc <- firstJustM mb_customDocs return$ cparen (prec>app_prec+1) doc - go _ t = pprTermM1 t firstJustM (mb:mbs) = mb >>= maybe (firstJustM mbs) (return . Just) firstJustM [] = return Nothing @@ -439,22 +458,21 @@ cPprTermBase y = coerceShow f _p = return . text . show . f . unsafeCoerce# . val - --TODO pprinting of list terms is not lazy + --Note pprinting of list terms is not lazy doList p h t = do let elems = h : getListTerms t - isConsLast = termType(last elems) /= termType h + isConsLast = not(termType(last elems) `coreEqType` termType h) print_elems <- mapM (y cons_prec) elems return$ if isConsLast then cparen (p >= cons_prec) - . hsep + . pprDeeperList fsep . punctuate (space<>colon) $ print_elems - else brackets (hcat$ punctuate comma print_elems) + else brackets (pprDeeperList fcat$ + punctuate comma print_elems) - where Just a /= Just b = not (a `coreEqType` b) - _ /= _ = True - getListTerms Term{subTerms=[h,t]} = h : getListTerms t - getListTerms Term{subTerms=[]} = [] + where getListTerms Term{subTerms=[h,t]} = h : getListTerms t + getListTerms Term{subTerms=[]} = [] getListTerms t@Suspension{} = [t] getListTerms t = pprPanic "getListTerms" (ppr t) @@ -574,7 +592,7 @@ cvObtainTerm hsc_env bound force mb_ty hval = runTR hsc_env $ do go bound _ _ _ | seq bound False = undefined go 0 tv _ty a = do clos <- trIO $ getClosureData a - return (Suspension (tipe clos) (Just tv) a Nothing) + return (Suspension (tipe clos) tv a Nothing) go bound tv ty a = do let monomorphic = not(isTyVarTy tv) -- This ^^^ is a convention. The ancestor tests for @@ -587,7 +605,17 @@ cvObtainTerm hsc_env bound force mb_ty hval = runTR hsc_env $ do -- and showing the '_' is more useful. t | isThunk t && force -> seq a $ go (pred bound) tv ty a -- We always follow indirections - Indirection _ -> go (pred bound) tv ty $! (ptrs clos ! 0) + Indirection _ -> go bound tv ty $! (ptrs clos ! 0) +-- We also follow references + MutVar _ | Just (tycon,[world,ty_contents]) <- splitTyConApp_maybe ty + -- , tycon == mutVarPrimTyCon + -> do + contents <- trIO$ IO$ \w -> readMutVar# (unsafeCoerce# a) w + tv' <- newVar liftedTypeKind + addConstraint tv (mkTyConApp tycon [world,tv']) + x <- go bound tv' ty_contents contents + return (RefWrap ty x) + -- The interesting case Constr -> do Right dcname <- dataConInfoPtrToName (infoPtr clos) @@ -632,8 +660,8 @@ cvObtainTerm hsc_env bound force mb_ty hval = runTR hsc_env $ do (drop extra_args subTtypes) return (Term tv (Right dc) a subTerms) -- The otherwise case: can be a Thunk,AP,PAP,etc. - tipe_clos -> - return (Suspension tipe_clos (Just tv) a Nothing) + tipe_clos -> + return (Suspension tipe_clos tv a Nothing) matchSubTypes dc ty | Just (_,ty_args) <- splitTyConApp_maybe (repType ty) @@ -649,11 +677,11 @@ cvObtainTerm hsc_env bound force mb_ty hval = runTR hsc_env $ do | isPointed ty = ASSERT2(not(null pointed) , ptext SLIT("reOrderTerms") $$ (ppr pointed $$ ppr unpointed)) - head pointed : reOrderTerms (tail pointed) unpointed tys + let (t:tt) = pointed in t : reOrderTerms tt unpointed tys | otherwise = ASSERT2(not(null unpointed) , ptext SLIT("reOrderTerms") $$ (ppr pointed $$ ppr unpointed)) - head unpointed : reOrderTerms pointed (tail unpointed) tys + let (t:tt) = unpointed in t : reOrderTerms pointed tt tys expandNewtypes t@Term{ ty=ty, subTerms=tt } | Just (tc, args) <- splitNewTyConApp_maybe ty @@ -705,6 +733,13 @@ cvReconstructType hsc_env max_depth mb_ty hval = runTR_maybe hsc_env $ do clos <- trIO $ getClosureData a case tipe clos of Indirection _ -> go tv $! (ptrs clos ! 0) + MutVar _ -> do + contents <- trIO$ IO$ \w -> readMutVar# (unsafeCoerce# a) w + tv' <- newVar liftedTypeKind + world <- newVar liftedTypeKind + addConstraint tv (mkTyConApp mutVarPrimTyCon [world,tv']) +-- x <- go tv' ty_contents contents + return [(tv', contents)] Constr -> do Right dcname <- dataConInfoPtrToName (infoPtr clos) (_,mb_dc) <- tryTcErrs (tcLookupDataCon dcname) @@ -736,16 +771,20 @@ cvReconstructType hsc_env max_depth mb_ty hval = runTR_maybe hsc_env $ do -- improved rtti_t computed by RTTI -- The main difference between RTTI types and their normal counterparts -- is that the former are _not_ polymorphic, thus polymorphism must - -- be stripped. Syntactically, forall's must be stripped -computeRTTIsubst :: Type -> Type -> Maybe TvSubst -computeRTTIsubst ty rtti_ty = + -- be stripped. Syntactically, forall's must be stripped. + -- We also remove predicates. +unifyRTTI :: Type -> Type -> TvSubst +unifyRTTI ty rtti_ty = + case mb_subst of + Just subst -> subst + Nothing -> pprPanic "Failed to compute a RTTI substitution" + (ppr (ty, rtti_ty)) -- In addition, we strip newtypes too, since the reconstructed type might -- not have recovered them all - tcUnifyTys (const BindMe) - [repType' $ dropForAlls$ ty] - [repType' $ rtti_ty] --- TODO stripping newtypes shouldn't be necessary, test - + -- TODO stripping newtypes shouldn't be necessary, test + where mb_subst = tcUnifyTys (const BindMe) + [rttiView ty] + [rttiView rtti_ty] -- Dealing with newtypes {- @@ -849,7 +888,7 @@ zonkTerm = foldTerm idTermFoldM { fTerm = \ty dc v tt -> sequence tt >>= \tt -> zonkTcType ty >>= \ty' -> return (Term ty' dc v tt) - ,fSuspension = \ct ty v b -> fmapMMaybe zonkTcType ty >>= \ty -> + ,fSuspension = \ct ty v b -> zonkTcType ty >>= \ty -> return (Suspension ct ty v b) ,fNewtypeWrap= \ty dc t -> return NewtypeWrap `ap` zonkTcType ty `ap` return dc `ap` t}