diff options
| author | Ben Lippmeier <benl@ouroborus.net> | 2010-11-25 06:09:04 +0000 |
|---|---|---|
| committer | Ben Lippmeier <benl@ouroborus.net> | 2010-11-25 06:09:04 +0000 |
| commit | 638bc3e317b7c2b0d88bd02edaa85a76cb60079a (patch) | |
| tree | 9a1517cd72050b7ce977ecf5cb398334fcb64d79 /compiler | |
| parent | e7f49f77492af621de30b69046a3f6b1f81650dc (diff) | |
| download | haskell-638bc3e317b7c2b0d88bd02edaa85a76cb60079a.tar.gz | |
vectoriser: fix conflicts
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/vectorise/Vectorise/Type/PADict.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/vectorise/Vectorise/Type/PADict.hs b/compiler/vectorise/Vectorise/Type/PADict.hs index 5a6867d29e..5feeb2aaaf 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 |