From bc062e2fd11672ccdd4705e5211efba0d8efbd64 Mon Sep 17 00:00:00 2001 From: christiaanb Date: Tue, 22 Jun 2010 11:36:28 +0200 Subject: [PATCH] Also simplify expressions of the DEFAULT alternative of case expressions --- clash/CLasH/Normalize.hs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/clash/CLasH/Normalize.hs b/clash/CLasH/Normalize.hs index 4fcc59a..89f21c0 100644 --- a/clash/CLasH/Normalize.hs +++ b/clash/CLasH/Normalize.hs @@ -490,7 +490,21 @@ casesimpl c expr@(Case scrut bndr ty alts) | not bndr_used = do -- sideeffect. doalt :: CoreAlt -> TransformMonad ([(CoreBndr, CoreExpr)], CoreAlt) doalt (LitAlt _, _, _) = error $ "Don't know how to handle LitAlt in case expression: " ++ pprString expr - doalt alt@(DEFAULT, [], expr) = return ([], alt) + doalt alt@(DEFAULT, [], expr) = do + local_var <- Trans.lift $ is_local_var expr + repr <- isRepr expr + (exprbinding_maybe, expr') <- if (not local_var) && repr + then do + id <- Trans.lift $ mkBinderFor expr "caseval" + -- We don't flag a change here, since casevalsimpl will do that above + -- based on Just we return here. + return (Just (id, expr), Var id) + else + -- Don't simplify anything else + return (Nothing, expr) + let newalt = (DEFAULT, [], expr') + let bindings = Maybe.catMaybes [exprbinding_maybe] + return (bindings, newalt) doalt (DataAlt dc, bndrs, expr) = do -- Make each binder wild, if possible bndrs_res <- Monad.zipWithM dobndr bndrs [0..] -- 2.30.2