summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2011-06-30 17:47:05 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2011-06-30 17:47:05 +0100
commitb9795364120f94affdd6735e2337dbaf650b426d (patch)
tree08b580aaddfe22b64e468bc838b6e13343e7f2f1
parentaa03ea53028d77c125968b106b4c9b896e8058f2 (diff)
downloadhaskell-b9795364120f94affdd6735e2337dbaf650b426d.tar.gz
Use isNonRuleLoopBreaker where possible, not isLoopBreaker
-rw-r--r--compiler/basicTypes/IdInfo.lhs2
-rw-r--r--compiler/coreSyn/CoreUtils.lhs2
-rw-r--r--compiler/vectorise/Vectorise.hs1
3 files changed, 3 insertions, 2 deletions
diff --git a/compiler/basicTypes/IdInfo.lhs b/compiler/basicTypes/IdInfo.lhs
index 2c7572bed2..0da50ad5e0 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 26d6cbf038..ea0ebfe56e 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 35ddd9d9a8..85b4e82705 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)
}