[commit: ghc] master: Comments and white space only (b5c1400)

git at git.haskell.org git at git.haskell.org
Tue Jul 21 16:42:50 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b5c1400fadccb0402678ea9eed83b03c79df761b/ghc

>---------------------------------------------------------------

commit b5c1400fadccb0402678ea9eed83b03c79df761b
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jul 9 13:23:08 2015 +0100

    Comments and white space only


>---------------------------------------------------------------

b5c1400fadccb0402678ea9eed83b03c79df761b
 compiler/coreSyn/CoreFVs.hs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/compiler/coreSyn/CoreFVs.hs b/compiler/coreSyn/CoreFVs.hs
index 688728a..f5f58dc 100644
--- a/compiler/coreSyn/CoreFVs.hs
+++ b/compiler/coreSyn/CoreFVs.hs
@@ -175,7 +175,7 @@ expr_fvs (Type ty)       = someVars (tyVarsOfType ty)
 expr_fvs (Coercion co)   = someVars (tyCoVarsOfCo co)
 expr_fvs (Var var)       = oneVar var
 expr_fvs (Lit _)         = noVars
-expr_fvs (Tick t expr) = tickish_fvs t `union` expr_fvs expr
+expr_fvs (Tick t expr)   = tickish_fvs t `union` expr_fvs expr
 expr_fvs (App fun arg)   = expr_fvs fun `union` expr_fvs arg
 expr_fvs (Lam bndr body) = addBndr bndr (expr_fvs body)
 expr_fvs (Cast expr co)  = expr_fvs expr `union` someVars (tyCoVarsOfCo co)
@@ -279,9 +279,11 @@ ruleRhsFreeVars (Rule { ru_fn = _, ru_bndrs = bndrs, ru_rhs = rhs })
 -- | Those variables free in the both the left right hand sides of a rule
 ruleFreeVars :: CoreRule -> VarSet
 ruleFreeVars (BuiltinRule {}) = noFVs
-ruleFreeVars (Rule { ru_fn = _, ru_bndrs = bndrs, ru_rhs = rhs, ru_args = args })
+ruleFreeVars (Rule { ru_fn = _do_not_include  -- See Note [Rule free var hack]
+                   , ru_bndrs = bndrs
+                   , ru_rhs = rhs, ru_args = args })
   = addBndrs bndrs (exprs_fvs (rhs:args)) isLocalVar emptyVarSet
-      -- See Note [Rule free var hack]
+
 
 idRuleRhsVars :: (Activation -> Bool) -> Id -> VarSet
 -- Just the variables free on the *rhs* of a rule



More information about the ghc-commits mailing list