X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FsimplCore%2FBinderInfo.lhs;fp=ghc%2Fcompiler%2FsimplCore%2FBinderInfo.lhs;h=f125975de0322c2a9f3e146b86fa462a2dd26c23;hb=69e14f75a4b031e489b7774914e5a176409cea78;hp=506950721be1b5af4a5de47096d66c1f1f49f2b5;hpb=c9dfd084e476b18290e964e5e5d66adf0771b9e6;p=ghc-hetmet.git

diff --git a/ghc/compiler/simplCore/BinderInfo.lhs b/ghc/compiler/simplCore/BinderInfo.lhs
index 5069507..f125975 100644
--- a/ghc/compiler/simplCore/BinderInfo.lhs
+++ b/ghc/compiler/simplCore/BinderInfo.lhs
@@ -15,7 +15,7 @@ module BinderInfo (
 
 	deadOccurrence, funOccurrence, noBinderInfo,
 
-	markLazy, markMany, markInsideLam, markInsideSCC,
+	markMany, markInsideLam, markInsideSCC,
 	getBinderInfoArity,
 	setBinderInfoArityToZero,
 
@@ -94,9 +94,9 @@ deadOccurrence :: BinderInfo
 deadOccurrence = DeadCode
 
 funOccurrence :: Int -> BinderInfo
-funOccurrence = OneOcc StrictOcc NotInsideSCC 1
+funOccurrence = OneOcc NotInsideLam NotInsideSCC 1
 
-markLazy, markMany, markInsideLam, markInsideSCC :: BinderInfo -> BinderInfo
+markMany, markInsideLam, markInsideSCC :: BinderInfo -> BinderInfo
 
 markMany (OneOcc _ _ _ ar) = ManyOcc ar
 markMany (ManyOcc ar) 	   = ManyOcc ar
@@ -108,9 +108,6 @@ markInsideLam other		 	  = other
 markInsideSCC (OneOcc dup_danger _ n_alts ar) = OneOcc dup_danger InsideSCC n_alts ar
 markInsideSCC other			      = other
 
-markLazy (OneOcc StrictOcc scc n_alts ar) = OneOcc LazyOcc scc n_alts ar
-markLazy other			          = other
-
 addBinderInfo, orBinderInfo :: BinderInfo -> BinderInfo -> BinderInfo
 
 addBinderInfo DeadCode info2 = info2
@@ -138,8 +135,7 @@ orBinderInfo info1 info2
 
 or_dups InsideLam _         = InsideLam
 or_dups _         InsideLam = InsideLam
-or_dups StrictOcc StrictOcc = StrictOcc
-or_dups _         _         = LazyOcc
+or_dups _         _         = NotInsideLam
 
 or_sccs InsideSCC _ = InsideSCC
 or_sccs _ InsideSCC = InsideSCC