Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-7.2
http://hackage.haskell.org/trac/ghc/changeset/12bbc18a7578b708ad608f2cca961c73b0e25924 >--------------------------------------------------------------- commit 12bbc18a7578b708ad608f2cca961c73b0e25924 Author: Simon Peyton Jones <[email protected]> Date: Thu Jun 30 17:47:05 2011 +0100 Use isNonRuleLoopBreaker where possible, not isLoopBreaker >--------------------------------------------------------------- compiler/basicTypes/IdInfo.lhs | 2 +- compiler/coreSyn/CoreUtils.lhs | 2 +- compiler/vectorise/Vectorise.hs | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/basicTypes/IdInfo.lhs b/compiler/basicTypes/IdInfo.lhs index 2c7572b..0da50ad 100644 --- a/compiler/basicTypes/IdInfo.lhs +++ b/compiler/basicTypes/IdInfo.lhs @@ -38,7 +38,7 @@ module IdInfo ( -- ** The OccInfo type OccInfo(..), - isDeadOcc, isLoopBreaker, + isDeadOcc, isLoopBreaker, isNonRuleLoopBreaker, occInfo, setOccInfo, InsideLam, OneBranch, diff --git a/compiler/coreSyn/CoreUtils.lhs b/compiler/coreSyn/CoreUtils.lhs index 26d6cbf..ea0ebfe 100644 --- a/compiler/coreSyn/CoreUtils.lhs +++ b/compiler/coreSyn/CoreUtils.lhs @@ -1391,7 +1391,7 @@ tryEtaReduce bndrs body --------------- fun_arity fun -- See Note [Arity care] - | isLocalId fun && isLoopBreaker (idOccInfo fun) = 0 + | isLocalId fun && isNonRuleLoopBreaker (idOccInfo fun) = 0 | otherwise = idArity fun --------------- diff --git a/compiler/vectorise/Vectorise.hs b/compiler/vectorise/Vectorise.hs index 35ddd9d..85b4e82 100644 --- a/compiler/vectorise/Vectorise.hs +++ b/compiler/vectorise/Vectorise.hs @@ -274,6 +274,7 @@ vectTopRhs recFs var expr = do { let fvs = freeVars expr ; (inline, isScalar, vexpr) <- inBind var $ vectPolyExpr (isLoopBreaker $ idOccInfo var) recFs fvs + -- Maybe isNonRuleLoopBreaker? ; return (inline, isScalar, vectorised vexpr) } _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
