[commit: ghc] wip/oneShot: Avoid inlining oneShot in unfoldings (63a5d69)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/oneShot
Link       : http://ghc.haskell.org/trac/ghc/changeset/63a5d69d7893749664c4beb955af64efc5bba982/ghc

>---------------------------------------------------------------

commit 63a5d69d7893749664c4beb955af64efc5bba982
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Oct 25 14:46:27 2014 +0200

    Avoid inlining oneShot in unfoldings


>---------------------------------------------------------------

63a5d69d7893749664c4beb955af64efc5bba982
 compiler/basicTypes/MkId.lhs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/basicTypes/MkId.lhs b/compiler/basicTypes/MkId.lhs
index 360c06d..b074c93 100644
--- a/compiler/basicTypes/MkId.lhs
+++ b/compiler/basicTypes/MkId.lhs
@@ -1124,8 +1124,8 @@ lazyId = pcMiscPrelId lazyIdName ty info
 oneShotId :: Id
 oneShotId = pcMiscPrelId oneShotName ty info
   where
-    info = noCafIdInfo `setInlinePragInfo` alwaysInlinePragma
-                       `setUnfoldingInfo`  mkCompulsoryUnfolding rhs
+    info = noCafIdInfo -- `setInlinePragInfo` alwaysInlinePragma
+                       `setUnfoldingInfo`  mkWwInlineRule rhs 1
     ty  = mkForAllTys [alphaTyVar, betaTyVar] (mkFunTy fun_ty fun_ty)
     fun_ty = mkFunTy alphaTy betaTy
     [body, x] = mkTemplateLocals [fun_ty, alphaTy]