From 4560a2d223f031462d4684b66e4e8f88ab8d75df Mon Sep 17 00:00:00 2001 From: "simonpj@microsoft.com" Date: Thu, 18 Sep 2008 15:51:44 +0000 Subject: [PATCH] Add a missing "prime" (env' --> env'') thereby fixing a tripping WARN. Hurrah! --- compiler/simplCore/Simplify.lhs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs index f27bb43..39bf3d8 100644 --- a/compiler/simplCore/Simplify.lhs +++ b/compiler/simplCore/Simplify.lhs @@ -510,7 +510,11 @@ makeTrivial env expr | otherwise -- See Note [Take care] below = do { var <- newId (fsLit "a") (exprType expr) ; env' <- completeNonRecX env False var var expr - ; return (env', substExpr env' (Var var)) } +-- pprTrace "makeTrivial" (vcat [ppr var <+> ppr (exprArity (substExpr env' (Var var))) +-- , ppr expr +-- , ppr (substExpr env' (Var var)) +-- , ppr (idArity (fromJust (lookupInScope (seInScope env') var))) ]) $ + ; return (env', substExpr env' (Var var)) } -- The substitution is needed becase we're constructing a new binding -- a = rhs -- And if rhs is of form (rhs1 |> co), then we might get @@ -1842,7 +1846,7 @@ mkDupableCont env (ApplyTo _ arg se cont) do { (env', dup_cont, nodup_cont) <- mkDupableCont env cont ; arg' <- simplExpr (se `setInScope` env') arg ; (env'', arg'') <- makeTrivial env' arg' - ; let app_cont = ApplyTo OkToDup arg'' (zapSubstEnv env') dup_cont + ; let app_cont = ApplyTo OkToDup arg'' (zapSubstEnv env'') dup_cont ; return (env'', app_cont, nodup_cont) } mkDupableCont env cont@(Select _ case_bndr [(_, bs, _rhs)] _ _) -- 1.7.10.4