From: Matthijs Kooijman Date: Fri, 14 Aug 2009 13:24:44 +0000 (+0200) Subject: Make inlinebind work for non-recursive lets. X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=077fe523188b85aff82569232acecfc9dbb082cb;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git Make inlinebind work for non-recursive lets. This removes the code for recursive lets, since it is no longer needed. --- diff --git "a/c\316\273ash/CLasH/Normalize/NormalizeTools.hs" "b/c\316\273ash/CLasH/Normalize/NormalizeTools.hs" index 76fc749..116c847 100644 --- "a/c\316\273ash/CLasH/Normalize/NormalizeTools.hs" +++ "b/c\316\273ash/CLasH/Normalize/NormalizeTools.hs" @@ -128,22 +128,15 @@ dotransforms transs expr = do -- Inline all let bindings that satisfy the given condition inlinebind :: ((CoreBndr, CoreExpr) -> TransformMonad Bool) -> Transform -inlinebind condition expr@(Let (Rec binds) res) = do - -- Find all bindings that adhere to the condition - res_eithers <- mapM docond binds - case Either.partitionEithers res_eithers of - -- No replaces? No change - ([], _) -> return expr - (replace, others) -> do - -- Substitute the to be replaced binders with their expression - let newexpr = substitute replace (Let (Rec others) res) - change newexpr - where - docond :: (CoreBndr, CoreExpr) -> TransformMonad (Either (CoreBndr, CoreExpr) (CoreBndr, CoreExpr)) - docond b = do - res <- condition b - return $ case res of True -> Left b; False -> Right b - +inlinebind condition expr@(Let (NonRec bndr expr') res) = do + applies <- condition (bndr, expr') + if applies + then + -- Substitute the binding in res and return that + change $ substitute [(bndr, expr')] res + else + -- Don't change this let + return expr -- Leave all other expressions unchanged inlinebind _ expr = return expr