From: Roman Leshchinskiy <rl@cse.unsw.edu.au>
Date: Sun, 18 Nov 2007 04:52:03 +0000 (+0000)
Subject: Fix bug in generation of environments for vectorisation
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=df6bc2ccddd8ff359e0381f4bb47e772e999029a;p=ghc-hetmet.git

Fix bug in generation of environments for vectorisation
---

diff --git a/compiler/vectorise/VectUtils.hs b/compiler/vectorise/VectUtils.hs
index a540b4d..fcdcfd9 100644
--- a/compiler/vectorise/VectUtils.hs
+++ b/compiler/vectorise/VectUtils.hs
@@ -455,7 +455,7 @@ mkLiftEnv lc tys vs
           
           env = Var (dataConWrapId env_con)
                 `mkTyApps`  env_tyargs
-                `mkVarApps` (lc : vs)
+                `mkApps`    (Var lc : args)
 
           bind env body = let scrut = unwrapFamInstScrut env_tc env_tyargs env
                           in
@@ -466,6 +466,9 @@ mkLiftEnv lc tys vs
   where
     vty = mkCoreTupTy tys
 
+    args  | null vs   = [Var unitDataConId]
+          | otherwise = map Var vs
+
     bndrs | null vs   = [mkWildId unitTy]
           | otherwise = vs