[commit: ghc] wip/oneShot: Avoid inlining oneShot in unfoldings (16066a1)

[Simon Peyton Jones]

|     Avoid inlining oneShot in unfoldings

I'm sure there's a reason for this but, again, please say what is, lest I accidentally reverse it in 3 years time.

Simon

| -----Original Message-----
| From: ghc-commits [mailto:ghc-commits-bounces at haskell.org] On Behalf Of
| git at git.haskell.org
| Sent: 25 October 2014 13:59
| To: ghc-commits at haskell.org
| Subject: [commit: ghc] wip/oneShot: Avoid inlining oneShot in unfoldings
| (16066a1)
| 
| Repository : ssh://git@git.haskell.org/ghc
| 
| On branch  : wip/oneShot
| Link       :
| http://ghc.haskell.org/trac/ghc/changeset/16066a165dd7245be58d0fbee265e13
| fb21e2aed/ghc
| 
| >---------------------------------------------------------------
| 
| commit 16066a165dd7245be58d0fbee265e13fb21e2aed
| Author: Joachim Breitner <mail at joachim-breitner.de>
| Date:   Sat Oct 25 14:46:27 2014 +0200
| 
|     Avoid inlining oneShot in unfoldings
| 
| 
| >---------------------------------------------------------------
| 
| 16066a165dd7245be58d0fbee265e13fb21e2aed
|  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 05dcdd5..31cd426 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]
| 
| _______________________________________________
| ghc-commits mailing list
| ghc-commits at haskell.org
| http://www.haskell.org/mailman/listinfo/ghc-commits