Simon Peyton Jones pushed to branch wip/T26115 at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Core/FVs.hs
    ... ... @@ -188,24 +188,21 @@ exprSomeFreeVarsDSet fv_cand e = fvDVarSet $ filterFV fv_cand $ exprFVs e
    188 188
     exprsSomeFreeVars :: InterestingVarFun  -- Says which 'Var's are interesting
    
    189 189
                       -> [CoreExpr]
    
    190 190
                       -> VarSet
    
    191
    -exprsSomeFreeVars fv_cand es =
    
    192
    -  fvVarSet $ filterFV fv_cand $ mapUnionFV exprFVs es
    
    191
    +exprsSomeFreeVars fv_cand es = fvVarSet $ filterFV fv_cand $ mapUnionFV exprFVs es
    
    193 192
     
    
    194 193
     -- | Finds free variables in several expressions selected by a predicate
    
    195 194
     -- returning a deterministically ordered list.
    
    196 195
     exprsSomeFreeVarsList :: InterestingVarFun  -- Says which 'Var's are interesting
    
    197 196
                           -> [CoreExpr]
    
    198 197
                           -> [Var]
    
    199
    -exprsSomeFreeVarsList fv_cand es =
    
    200
    -  fvVarList $ filterFV fv_cand $ mapUnionFV exprFVs es
    
    198
    +exprsSomeFreeVarsList fv_cand es = fvVarList $ filterFV fv_cand $ mapUnionFV exprFVs es
    
    201 199
     
    
    202 200
     -- | Finds free variables in several expressions selected by a predicate
    
    203 201
     -- returning a deterministic set.
    
    204 202
     exprsSomeFreeVarsDSet :: InterestingVarFun -- ^ Says which 'Var's are interesting
    
    205 203
                           -> [CoreExpr]
    
    206 204
                           -> DVarSet
    
    207
    -exprsSomeFreeVarsDSet fv_cand e =
    
    208
    -  fvDVarSet $ filterFV fv_cand $ mapUnionFV exprFVs e
    
    205
    +exprsSomeFreeVarsDSet fv_cand e = fvDVarSet $ filterFV fv_cand $ mapUnionFV exprFVs e
    
    209 206
     
    
    210 207
     --      Comment about obsolete code
    
    211 208
     -- We used to gather the free variables the RULES at a variable occurrence
    

  • compiler/GHC/Core/Opt/Specialise.hs
    ... ... @@ -2594,12 +2594,12 @@ specHeader
    2594 2594
                   , Core.Subst   -- Apply this to the body
    
    2595 2595
     
    
    2596 2596
                     -- RULE helpers
    
    2597
    -                -- RULE forall rule_bndrs. f rule_es = $sf spec_bndrs
    
    2597
    +                -- `RULE forall rule_bndrs. f rule_es = $sf spec_bndrs`
    
    2598 2598
                   , [OutBndr]    -- rule_bndrs: Binders for the RULE
    
    2599 2599
                   , [OutExpr]    -- rule_es:    Args for the LHS of the rule
    
    2600 2600
     
    
    2601 2601
                     -- Specialised function helpers
    
    2602
    -                -- $sf = \spec_bndrs. let { dx_binds } in <orig-rhs> spec_arg
    
    2602
    +                -- `$sf = \spec_bndrs. let { dx_binds } in <orig-rhs> spec_arg`
    
    2603 2603
                   , [OutBndr]    -- spec_bndrs: Binders for $sf. Subset of rule_bndrs.
    
    2604 2604
                   , [DictBind]   -- dx_binds:   Auxiliary dictionary bindings
    
    2605 2605
                   , [OutExpr]    -- spec_args:  Specialised arguments for unfolding