Commit 10b66230 authored by keithw's avatar keithw
Browse files

[project @ 1999-06-25 11:45:24 by keithw]

Rescue UsageSP analysis from bit-rot.
parent 3c0c2b28
......@@ -659,7 +659,9 @@ noLBVarInfo = NoLBVarInfo
-- not safe to print or parse LBVarInfo because it is not really a
-- property of the definition, but a property of the context.
pprLBVarInfo NoLBVarInfo = empty
pprLBVarInfo IsOneShotLambda = ptext SLIT("OneShot")
pprLBVarInfo IsOneShotLambda = getPprStyle $ \ sty ->
if ifaceStyle sty then empty
else ptext SLIT("OneShot")
instance Outputable LBVarInfo where
ppr = pprLBVarInfo
......
......@@ -16,6 +16,7 @@ import CoreSyn
import CoreUnfold ( noUnfolding )
import CoreLint ( beginPass, endPass )
import Rules ( ProtoCoreRule(..) )
import UsageSPInf ( doUsageSPInf )
import VarEnv
import VarSet
import Var ( Id, IdOrTyVar )
......@@ -38,8 +39,6 @@ import Unique ( Uniquable(..) )
import SrcLoc ( noSrcLoc )
import Util ( mapAccumL )
import Outputable
doUsageSPInf = panic "doUsageSpInf"
\end{code}
......
......@@ -81,6 +81,7 @@ extractHsTyNames ty
`unionNameSets` extractHsTyNames_s tys
get (MonoFunTy ty1 ty2) = get ty1 `unionNameSets` get ty2
get (MonoDictTy cls tys) = unitNameSet cls `unionNameSets` extractHsTyNames_s tys
get (MonoUsgTy u ty) = get ty
get (MonoTyVar tv) = unitNameSet tv
get (HsForAllTy (Just tvs)
ctxt ty) = (extractHsCtxtTyNames ctxt `unionNameSets` get ty)
......
......@@ -19,7 +19,6 @@ import CmdLineOpts ( CoreToDo(..), SimplifierSwitch(..),
opt_UsageSPOn,
)
import CoreLint ( beginPass, endPass )
import CoreTidy ( tidyCorePgm )
import CoreSyn
import CSE ( cseProgram )
import Rules ( RuleBase, ProtoCoreRule(..), pprProtoCoreRule, prepareRuleBase, orphanRule )
......
......@@ -6,7 +6,7 @@
This code is (based on) PhD work of Keith Wansbrough <kw217@cl.cam.ac.uk>,
September 1998 .. May 1999.
Keith Wansbrough 1998-09-04..1999-05-05
Keith Wansbrough 1998-09-04..1999-06-25
\begin{code}
module UsageSPInf ( doUsageSPInf ) where
......@@ -356,6 +356,8 @@ usgInfCE (Note (Coerce ty1 ty0) e)
usgInfCE (Note InlineCall e) = usgInfCE e
usgInfCE (Note InlineMe e) = usgInfCE e
usgInfCE (Note (TermUsg u) e) = pprTrace "usgInfCE: ignoring extra TermUsg:" (ppr u) $
usgInfCE e
......
......@@ -6,7 +6,7 @@
This code is (based on) PhD work of Keith Wansbrough <kw217@cl.cam.ac.uk>,
September 1998 .. May 1999.
Keith Wansbrough 1998-09-04..1999-05-03
Keith Wansbrough 1998-09-04..1999-06-25
\begin{code}
module UsageSPLint ( doLintUSPAnnotsBinds,
......@@ -343,6 +343,8 @@ checkCE (Note (Coerce _ _) e) (Note (Coerce _ _) e') = checkCE e e'
checkCE (Note InlineCall e) (Note InlineCall e') = checkCE e e'
checkCE (Note InlineMe e) (Note InlineMe e') = checkCE e e'
checkCE t@(Note (TermUsg u) e) t'@(Note (TermUsg u') e')
= checkCE e e'
`unionBags` (checkUsg u u' (WorseTerm t t'))
......
......@@ -6,7 +6,7 @@
This code is (based on) PhD work of Keith Wansbrough <kw217@cl.cam.ac.uk>,
September 1998 .. May 1999.
Keith Wansbrough 1998-09-04..1999-05-07
Keith Wansbrough 1998-09-04..1999-06-25
\begin{code}
module UsageSPUtils ( AnnotM(AnnotM), initAnnotM,
......@@ -290,6 +290,9 @@ genAnnotCE mungeType mungeTerm = go
go (Note InlineCall e) = do { e' <- go e
; return (Note InlineCall e')
}
go (Note InlineMe e) = do { e' <- go e
; return (Note InlineMe e')
}
go e0@(Note (TermUsg _) _) = do { e1 <- mungeTerm e0
; case e1 of -- munge may have removed note
Note tu@(TermUsg _) e2 -> do { e3 <- go e2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment