Don't propagate types with free tyvars.

[matthijs/master-project/cλash.git] / Normalize.hs

diff --git a/Normalize.hs b/Normalize.hs
index d06670cfbb363b244460c0497a3f3de12ba60234..0d58d04a9d53c323494a046914047b0178b10eee 100644 (file)
--- a/Normalize.hs
+++ b/Normalize.hs
@@ -294,8 +294,10 @@ appsimpltop = everywhere ("appsimpl", appsimpl)
 typeprop, typeproptop :: Transform
 -- Transform any function that is applied to a type argument. Since type
 -- arguments are always the first ones to apply and we'll remove all type
--- arguments, we can simply do them one by one.
-typeprop expr@(App (Var f) (Type ty)) = do
+-- arguments, we can simply do them one by one. We only propagate type
+-- 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