diff options
| -rw-r--r-- | compiler/simplCore/CommonContext.lhs | 2 | ||||
| -rw-r--r-- | compiler/simplCore/SimplCore.lhs | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/compiler/simplCore/CommonContext.lhs b/compiler/simplCore/CommonContext.lhs index 9199e70154..1cfcbe9912 100644 --- a/compiler/simplCore/CommonContext.lhs +++ b/compiler/simplCore/CommonContext.lhs @@ -52,6 +52,8 @@ findInterestingLet (Let (Rec pairs) body) = process :: Var -> CoreExpr -> CoreExpr -> (Var, CoreExpr, CoreExpr) process v e body | idArity v <= 0 = (v, e, body) + -- TODO: check for non value args here. For now, ignore this let then + -- Possibly later: Check if all uses have the same type argument | otherwise = case contextOf v body of OneUse cts | not (null cts) -> diff --git a/compiler/simplCore/SimplCore.lhs b/compiler/simplCore/SimplCore.lhs index 92784d33b3..110c461d39 100644 --- a/compiler/simplCore/SimplCore.lhs +++ b/compiler/simplCore/SimplCore.lhs @@ -190,8 +190,6 @@ getCoreToDo dflags demand_analyser = (CoreDoPasses ([ CoreDoStrictness, CoreDoWorkerWrapper, - simpl_phase 0 ["post-worker-wrapper"] max_iter, - CoreCommonContext, simpl_phase 0 ["post-worker-wrapper"] max_iter ])) @@ -293,6 +291,9 @@ getCoreToDo dflags -- reduce the possiblility of shadowing -- Reason: see Note [Shadowing] in SpecConstr.lhs + CoreCommonContext, + simpl_phase 0 ["post-common-context"] max_iter, + runWhen spec_constr CoreDoSpecConstr, maybe_rule_check (Phase 0), |