From: Ben Lippmeier <benl@ouroborus.net>
Date: Thu, 25 Nov 2010 06:09:04 +0000 (+0000)
Subject: vectoriser: fix conflicts
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=638bc3e317b7c2b0d88bd02edaa85a76cb60079a;p=ghc-hetmet.git

vectoriser: fix conflicts
---

diff --git a/compiler/vectorise/Vectorise/Type/PADict.hs b/compiler/vectorise/Vectorise/Type/PADict.hs
index 5a6867d..5feeb2a 100644
--- a/compiler/vectorise/Vectorise/Type/PADict.hs
+++ b/compiler/vectorise/Vectorise/Type/PADict.hs
@@ -63,9 +63,9 @@ buildPADict vect_tc prepr_tc arr_tc repr
       $ do
           expr     <- build vect_tc prepr_tc arr_tc repr
           let body = mkLams (tvs ++ args) expr
-          raw_var <- newExportedVar (method_name name) (exprType body)
-          let var = raw_var
-                      `setIdUnfolding` mkInlineRule body (Just (length args))
+          raw_var  <- newExportedVar (method_name name) (exprType body)
+          let var  = raw_var
+                      `setIdUnfolding` mkInlineUnfolding (Just (length args)) body
                       `setInlinePragma` alwaysInlinePragma
           hoistBinding var body
           return var