[commit: ghc] late-lam-lift: Merge branch 'late-lambda-float' (97ee272)

[Nicolas Frisby]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : late-lam-lift

https://github.com/ghc/ghc/commit/97ee272f407b172926b49c159841420713604d9b

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

commit 97ee272f407b172926b49c159841420713604d9b
Merge: 60015db d62b64d
Author: Nicolas Frisby <nicolas.frisby at gmail.com>
Date:   Thu Apr 4 22:21:58 2013 +0100

    Merge branch 'late-lambda-float'

 compiler/basicTypes/VarEnv.lhs     |    4 +-
 compiler/coreSyn/CoreFVs.lhs       |    1 +
 compiler/coreSyn/CoreSyn.lhs       |    6 +-
 compiler/coreSyn/CoreUnfold.lhs    |   54 +-
 compiler/main/DynFlags.hs          |   81 ++-
 compiler/main/StaticFlags.hs       |    1 -
 compiler/simplCore/CoreMonad.lhs   |   75 ++-
 compiler/simplCore/FloatOut.lhs    |    2 +-
 compiler/simplCore/SetLevels.lhs   | 1283 +++++++++++++++++++++++++++++++-----
 compiler/simplCore/SimplCore.lhs   |   54 +-
 compiler/specialise/SpecConstr.lhs |    2 +-
 compiler/stgSyn/CoreToStg.lhs      |   51 +-
 compiler/stranal/WwLib.lhs         |    8 +-
 compiler/utils/UniqFM.lhs          |    3 +
 14 files changed, 1376 insertions(+), 249 deletions(-)

diff --cc compiler/main/DynFlags.hs
index ba86062,7c8d978..e90c4b0
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@@ -1222,9 -1236,10 +1241,11 @@@ defaultDynFlags mySettings 
          simplTickFactor         = 100,
          specConstrThreshold     = Just 2000,
          specConstrCount         = Just 3,
 +        specConstrRecursive     = 3,
          liberateCaseThreshold   = Just 2000,
-         floatLamArgs            = Just 0, -- Default: float only if no fvs
+ 
+         floatLamArgs            = Just 0,  -- Default: float only if no fvs
+ 
          historySize             = 20,
          strictnessBefore        = [],