From dfc9d309a5202d65032c80f5b74df17035a61b8c Mon Sep 17 00:00:00 2001 From: Simon Peyton Jones Date: Fri, 29 Aug 2014 10:14:45 +0100 Subject: Define mapUnionVarSet, and use it Call sites are much easier to understand than before --- compiler/simplCore/FloatIn.lhs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/simplCore/FloatIn.lhs') diff --git a/compiler/simplCore/FloatIn.lhs b/compiler/simplCore/FloatIn.lhs index f00768a9f5..a90d59cf77 100644 --- a/compiler/simplCore/FloatIn.lhs +++ b/compiler/simplCore/FloatIn.lhs @@ -344,7 +344,7 @@ fiExpr dflags to_drop (_,AnnLet (AnnRec bindings) body) body_fvs = freeVarsOf body -- See Note [extra_fvs (1,2)] - rule_fvs = foldr (unionVarSet . idRuleAndUnfoldingVars) emptyVarSet ids + rule_fvs = mapUnionVarSet idRuleAndUnfoldingVars ids extra_fvs = rule_fvs `unionVarSet` unionVarSets [ fvs | (fvs, rhs) <- rhss , noFloatIntoExpr rhs ] @@ -552,7 +552,7 @@ sepBindsByDropPoint dflags is_case drop_pts floaters floatedBindsFVs :: FloatInBinds -> FreeVarSet -floatedBindsFVs binds = foldr (unionVarSet . fbFVs) emptyVarSet binds +floatedBindsFVs binds = mapUnionVarSet fbFVs binds fbFVs :: FloatInBind -> VarSet fbFVs (FB _ fvs _) = fvs -- cgit v1.2.1