X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Normalize.hs;h=ea8dd045d60579df06df560667806ec4f51717d6;hb=3a611c1075c67670ed6c86a5e74b59b0b379721c;hp=cbe2090e22def5d29d3b24bb878f37c68b81b3ea;hpb=031ee3b7556147516be038372de576b3db6b67ba;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git diff --git a/Normalize.hs b/Normalize.hs index cbe2090..ea8dd04 100644 --- a/Normalize.hs +++ b/Normalize.hs @@ -62,7 +62,7 @@ beta (App (Let binds expr) arg) = change $ Let binds (App expr arg) beta (App (Case scrut b ty alts) arg) = change $ Case scrut b ty' alts' where alts' = map (\(con, bndrs, expr) -> (con, bndrs, (App expr arg))) alts - (_, ty') = Type.splitFunTy ty + ty' = CoreUtils.applyTypeToArg ty arg -- Leave all other expressions unchanged beta expr = return expr -- Perform this transform everywhere @@ -302,14 +302,13 @@ typeprop, typeproptop :: Transform -- arguments without any free tyvars, since tyvars those wouldn't be in scope -- in the new function. typeprop expr@(App (Var f) arg@(Type ty)) | not $ has_free_tyvars arg = do - id <- cloneVar f - let newty = Type.applyTy (Id.idType f) ty - let newf = Var.setVarType id newty body_maybe <- Trans.lift $ getGlobalBind f case body_maybe of Just body -> do let newbody = App body (Type ty) - Trans.lift $ addGlobalBind newf newbody + -- Create a new function with the same name but a new body + newf <- mkFunction f newbody + -- Replace the application with this new function change (Var newf) -- If we don't have a body for the function called, leave it unchanged (it -- should be a primitive function then). @@ -346,11 +345,8 @@ funprop expr@(App _ _) | is_var fexpr && not (any has_free_tyvars args) = do -- Create a new body that consists of a lambda for all new arguments and -- the old body applied to some arguments. let newbody = MkCore.mkCoreLams newparams (MkCore.mkCoreApps body oldargs) - -- Create a new function name - id <- cloneVar f - let newf = Var.setVarType id (CoreUtils.exprType newbody) - -- Add the new function - Trans.lift $ addGlobalBind newf newbody + -- Create a new function with the same name but a new body + newf <- mkFunction f newbody -- Replace the original application with one of the new function to the -- new arguments. change $ MkCore.mkCoreApps (Var newf) newargs @@ -433,34 +429,46 @@ normalizeModule uniqsupply bindings generate_for statefuls = runTransformSession return $ filter ((flip VarSet.elemVarSet normalized_bindings) . fst) bindings normalizeBind :: CoreBndr -> TransformSession () -normalizeBind bndr = do - normalized_funcs <- getA tsNormalized - -- See if this function was normalized already - if VarSet.elemVarSet bndr normalized_funcs +normalizeBind bndr = + -- Skip binders that have a polymorphic type, since it's impossible to + -- create polymorphic hardware. + if is_poly (Var bndr) then - -- Yup, don't do it again - return () + -- This should really only happen at the top level... TODO: Give + -- a different error if this happens down in the recursion. + error $ "Function " ++ show bndr ++ " is polymorphic, can't normalize" else do - -- Nope, note that it has been and do it. - modA tsNormalized (flip VarSet.extendVarSet bndr) - expr_maybe <- getGlobalBind bndr - case expr_maybe of - Just expr -> do - -- Normalize this expression - trace ("Transforming " ++ (show bndr) ++ "\nBefore:\n\n" ++ showSDoc ( ppr expr ) ++ "\n") $ return () - expr' <- dotransforms transforms expr - trace ("\nAfter:\n\n" ++ showSDoc ( ppr expr')) $ return () - -- And store the normalized version in the session - modA tsBindings (Map.insert bndr expr') - -- Find all vars used with a function type. All of these should be global - -- binders (i.e., functions used), since any local binders with a function - -- type should have been inlined already. - let used_funcs_set = CoreFVs.exprSomeFreeVars (\v -> (Type.isFunTy . snd . Type.splitForAllTys . Id.idType) v) expr' - let used_funcs = VarSet.varSetElems used_funcs_set - -- Process each of the used functions recursively - mapM normalizeBind used_funcs + normalized_funcs <- getA tsNormalized + -- See if this function was normalized already + if VarSet.elemVarSet bndr normalized_funcs + then + -- Yup, don't do it again return () - -- We don't have a value for this binder, let's assume this is a builtin - -- function. This might need some extra checking and a nice error - -- message). - Nothing -> return () + else do + -- Nope, note that it has been and do it. + modA tsNormalized (flip VarSet.extendVarSet bndr) + expr_maybe <- getGlobalBind bndr + case expr_maybe of + Just expr -> do + -- Introduce an empty Let at the top level, so there will always be + -- a let in the expression (none of the transformations will remove + -- the last let). + let expr' = Let (Rec []) expr + -- Normalize this expression + trace ("Transforming " ++ (show bndr) ++ "\nBefore:\n\n" ++ showSDoc ( ppr expr' ) ++ "\n") $ return () + expr' <- dotransforms transforms expr' + trace ("\nAfter:\n\n" ++ showSDoc ( ppr expr')) $ return () + -- And store the normalized version in the session + modA tsBindings (Map.insert bndr expr') + -- Find all vars used with a function type. All of these should be global + -- binders (i.e., functions used), since any local binders with a function + -- type should have been inlined already. + let used_funcs_set = CoreFVs.exprSomeFreeVars (\v -> (Type.isFunTy . snd . Type.splitForAllTys . Id.idType) v) expr' + let used_funcs = VarSet.varSetElems used_funcs_set + -- Process each of the used functions recursively + mapM normalizeBind used_funcs + return () + -- We don't have a value for this binder, let's assume this is a builtin + -- function. This might need some extra checking and a nice error + -- message). + Nothing -> return ()