X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghci%2FRtClosureInspect.hs;h=4b9c38776842ae67869b4e2faee171c705a292e9;hp=3ea2ba9204c672be2cef424dea014e939c6a6912;hb=17b297d97d327620ed6bfab942f8992b2446f1bf;hpb=876db7eda26b37f988bda8f6da8616b03aa5f810 diff --git a/compiler/ghci/RtClosureInspect.hs b/compiler/ghci/RtClosureInspect.hs index 3ea2ba9..4b9c387 100644 --- a/compiler/ghci/RtClosureInspect.hs +++ b/compiler/ghci/RtClosureInspect.hs @@ -6,11 +6,21 @@ -- ----------------------------------------------------------------------------- +{-# OPTIONS_GHC -w #-} +-- The above warning supression flag is a temporary kludge. +-- While working on this module you are encouraged to remove it and fix +-- any warnings in the module. See +-- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings +-- for details + module RtClosureInspect( - cvObtainTerm, -- :: HscEnv -> Bool -> Maybe Type -> HValue -> IO Term + cvObtainTerm, -- :: HscEnv -> Int -> Bool -> Maybe Type -> HValue -> IO Term Term(..), + isTerm, + isSuspension, + isPrim, pprTerm, cPprTerm, cPprTermBase, @@ -26,7 +36,13 @@ module RtClosureInspect( termTyVars, -- unsafeDeepSeq, cvReconstructType, - sigmaType + computeRTTIsubst, + sigmaType, + Closure(..), + getClosureData, + ClosureType(..), + isConstr, + isIndirection ) where #include "HsVersions.h" @@ -38,7 +54,7 @@ import Linker import DataCon import Type -import TcRnMonad ( TcM, initTc, initTcPrintErrors, ioToTcRn, +import TcRnMonad ( TcM, initTc, ioToTcRn, tryTcErrs) import TcType import TcMType @@ -69,6 +85,8 @@ import Data.Maybe import Data.Array.Base import Data.List ( partition ) import qualified Data.Sequence as Seq +import Data.Monoid +import Data.Sequence hiding (null, length, index, take, drop, splitAt, reverse) import Foreign import System.IO.Unsafe @@ -162,8 +180,8 @@ getClosureData a = (# iptr, ptrs, nptrs #) -> do itbl <- peek (Ptr iptr) let tipe = readCType (BCI.tipe itbl) - elems = BCI.ptrs itbl - ptrsList = Array 0 ((fromIntegral elems) - 1) ptrs + elems = fromIntegral (BCI.ptrs itbl) + ptrsList = Array 0 (elems - 1) elems ptrs nptrs_data = [W# (indexWordArray# nptrs i) | I# i <- [0.. fromIntegral (BCI.nptrs itbl)] ] ASSERT(fromIntegral elems >= 0) return () @@ -205,9 +223,9 @@ isFullyEvaluated a = do otherwise -> return False where amapM f = sequence . amap' f -amap' f (Array i0 i arr#) = map (\(I# i#) -> case indexArray# arr# i# of - (# e #) -> f e) - [0 .. i - i0] +amap' f (Array i0 i _ arr#) = map g [0 .. i - i0] + where g (I# i#) = case indexArray# arr# i# of + (# e #) -> f e -- TODO: Fix it. Probably the otherwise case is failing, trace/debug it {- @@ -234,7 +252,7 @@ extractUnboxed tt clos = go tt (nonPtrs clos) | otherwise = pprPanic "Expected a TcTyCon" (ppr t) go [] _ = [] go (t:tt) xx - | (x, rest) <- splitAt (sizeofType t `div` wORD_SIZE) xx + | (x, rest) <- splitAt ((sizeofType t + wORD_SIZE - 1) `div` wORD_SIZE) xx = x : go tt rest sizeofTyCon = sizeofPrimRep . tyConPrimRep @@ -467,24 +485,28 @@ instScheme ty | (tvs, rho) <- tcSplitForAllTys ty = liftTcM$ do -- do its magic. addConstraint :: TcType -> TcType -> TR () addConstraint t1 t2 = congruenceNewtypes t1 t2 >>= uncurry unifyType - - + >> return () -- TOMDO: what about the coercion? + -- we should consider family instances -- Type & Term reconstruction -cvObtainTerm :: HscEnv -> Bool -> Maybe Type -> HValue -> IO Term -cvObtainTerm hsc_env force mb_ty hval = runTR hsc_env $ do +cvObtainTerm :: HscEnv -> Int -> Bool -> Maybe Type -> HValue -> IO Term +cvObtainTerm hsc_env bound force mb_ty hval = runTR hsc_env $ do tv <- newVar argTypeKind case mb_ty of - Nothing -> go tv tv hval >>= zonkTerm - Just ty | isMonomorphic ty -> go ty ty hval >>= zonkTerm + Nothing -> go bound tv tv hval >>= zonkTerm + Just ty | isMonomorphic ty -> go bound ty ty hval >>= zonkTerm Just ty -> do (ty',rev_subst) <- instScheme (sigmaType ty) addConstraint tv ty' - term <- go tv tv hval >>= zonkTerm + term <- go bound tv tv hval >>= zonkTerm --restore original Tyvars return$ mapTermType (substTy rev_subst) term where - go tv ty a = 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) + go bound tv ty a = do let monomorphic = not(isTyVarTy tv) -- This ^^^ is a convention. The ancestor tests for -- monomorphism and passes a type instead of a tv @@ -494,9 +516,9 @@ cvObtainTerm hsc_env force mb_ty hval = runTR hsc_env $ do -- NB. this won't attempt to force a BLACKHOLE. Even with :force, we never -- force blackholes, because it would almost certainly result in deadlock, -- and showing the '_' is more useful. - t | isThunk t && force -> seq a $ go tv ty a + t | isThunk t && force -> seq a $ go (pred bound) tv ty a -- We always follow indirections - Indirection _ -> go tv ty $! (ptrs clos ! 0) + Indirection _ -> go (pred bound) tv ty $! (ptrs clos ! 0) -- The interesting case Constr -> do Right dcname <- dataConInfoPtrToName (infoPtr clos) @@ -510,7 +532,7 @@ cvObtainTerm hsc_env force mb_ty hval = runTR hsc_env $ do let tag = showSDoc (ppr dcname) vars <- replicateM (length$ elems$ ptrs clos) (newVar (liftedTypeKind)) - subTerms <- sequence [appArr (go tv tv) (ptrs clos) i + subTerms <- sequence [appArr (go (pred bound) tv tv) (ptrs clos) i | (i, tv) <- zip [0..] vars] return (Term tv (Left ('<' : tag ++ ">")) a subTerms) Just dc -> do @@ -533,7 +555,7 @@ cvObtainTerm hsc_env force mb_ty hval = runTR hsc_env $ do addConstraint myType signatureType subTermsP <- sequence $ drop extra_args -- ^^^ all extra arguments are pointed - [ appArr (go tv t) (ptrs clos) i + [ appArr (go (pred bound) tv t) (ptrs clos) i | (i,tv,t) <- zip3 [0..] subTermTvs subTtypesP] let unboxeds = extractUnboxed subTtypesNP clos subTermsNP = map (uncurry Prim) (zip subTtypesNP unboxeds) @@ -541,9 +563,10 @@ cvObtainTerm hsc_env 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. - otherwise -> - return (Suspension (tipe clos) (Just tv) a Nothing) + tipe_clos -> + return (Suspension tipe_clos (Just tv) a Nothing) +-- matchSubTypes dc ty | pprTrace "matchSubtypes" (ppr dc <+> ppr ty) False = undefined matchSubTypes dc ty | Just (_,ty_args) <- splitTyConApp_maybe (repType ty) -- assumption: ^^^ looks through newtypes @@ -573,62 +596,78 @@ cvReconstructType hsc_env force mb_ty hval = runTR_maybe hsc_env $ do tv <- newVar argTypeKind case mb_ty of Nothing -> do search (isMonomorphic `fmap` zonkTcType tv) - (uncurry go) - [(tv, hval)] + (uncurry go) + (Seq.singleton (tv, hval)) max_depth zonkTcType tv -- TODO untested! Just ty | isMonomorphic ty -> return ty - Just ty -> do - (ty',rev_subst) <- instScheme (sigmaType ty) + Just ty -> do + (ty',rev_subst) <- instScheme (sigmaType ty) addConstraint tv ty' - search (isMonomorphic `fmap` zonkTcType tv) - (uncurry go) - [(tv, hval)] + search (isMonomorphic `fmap` zonkTcType tv) + (\(ty,a) -> go ty a) + (Seq.singleton (tv, hval)) max_depth substTy rev_subst `fmap` zonkTcType tv where -- search :: m Bool -> ([a] -> [a] -> [a]) -> [a] -> m () - search stop expand [] depth = return () + search stop expand l depth | Seq.null l = return () search stop expand x 0 = fail$ "Failed to reconstruct a type after " ++ show max_depth ++ " steps" - search stop expand (x:xx) d = do - new <- expand x - unlessM stop $ search stop expand (xx ++ new) $! (pred d) + search stop expand l d | x :< xx <- viewl l = unlessM stop $ do + new <- expand x + search stop expand (xx `mappend` Seq.fromList new) $! (pred d) -- returns unification tasks,since we are going to want a breadth-first search go :: Type -> HValue -> TR [(Type, HValue)] - go tv a = do + go tv a = do clos <- trIO $ getClosureData a case tipe clos of Indirection _ -> go tv $! (ptrs clos ! 0) Constr -> do - mb_dcname <- dataConInfoPtrToName (infoPtr clos) - case mb_dcname of - Left tag -> do - vars <- replicateM (length$ elems$ ptrs clos) + Right dcname <- dataConInfoPtrToName (infoPtr clos) + (_,mb_dc) <- tryTcErrs (tcLookupDataCon dcname) + case mb_dc of + Nothing-> do + -- TODO: Check this case + vars <- replicateM (length$ elems$ ptrs clos) (newVar (liftedTypeKind)) - subTerms <- sequence [ appArr (go tv) (ptrs clos) i + subTerms <- sequence [ appArr (go tv) (ptrs clos) i | (i, tv) <- zip [0..] vars] forM [0..length (elems $ ptrs clos)] $ \i -> do - tv <- newVar openTypeKind + tv <- newVar liftedTypeKind return$ appArr (\e->(tv,e)) (ptrs clos) i - Right name -> do - dc <- tcLookupDataCon name - let extra_args = length(dataConRepArgTys dc) - + Just dc -> do + let extra_args = length(dataConRepArgTys dc) - length(dataConOrigArgTys dc) subTtypes <- mapMif (not . isMonomorphic) (\t -> newVar (typeKind t)) (dataConRepArgTys dc) + -- It is vital for newtype reconstruction that the unification step -- is done right here, _before_ the subterms are RTTI reconstructed let myType = mkFunTys subTtypes tv (signatureType,_) <- instScheme(dataConRepType dc) addConstraint myType signatureType return $ [ appArr (\e->(t,e)) (ptrs clos) i - | (i,t) <- drop extra_args $ zip [0..] subTtypes] + | (i,t) <- drop extra_args $ + zip [0..] (filter isPointed subTtypes)] otherwise -> return [] + -- This helper computes the difference between a base type t and the + -- 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 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 + -- Dealing with newtypes {- @@ -712,9 +751,10 @@ mapMif_ pred f (x:xx) = (if pred x then f x else return x) : mapMif_ pred f xx unlessM condM acc = condM >>= \c -> unless c acc -- Strict application of f at index i -appArr f a@(Array _ _ ptrs#) i@(I# i#) = ASSERT (i < length(elems a)) - case indexArray# ptrs# i# of - (# e #) -> f e +appArr f a@(Array _ _ _ ptrs#) i@(I# i#) + = ASSERT (i < length(elems a)) + case indexArray# ptrs# i# of + (# e #) -> f e zonkTerm :: Term -> TcM Term zonkTerm = foldTerm idTermFoldM {