[commit: ghc] wip/nested-cpr: Merge remote-tracking branch 'origin/master' into better-ho-cardinality (84d4165)

[git at git.haskell.org]

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

On branch  : wip/nested-cpr
Link       : http://ghc.haskell.org/trac/ghc/changeset/84d4165af88d22db38424591e8984ef6e7b885c0/ghc

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

commit 84d4165af88d22db38424591e8984ef6e7b885c0
Merge: 20cc594 4025d66
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Dec 3 14:04:03 2013 +0000

    Merge remote-tracking branch 'origin/master' into better-ho-cardinality



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

84d4165af88d22db38424591e8984ef6e7b885c0
 compiler/basicTypes/Demand.lhs            |   14 +
 compiler/cmm/CmmInfo.hs                   |   17 ++
 compiler/cmm/CmmPipeline.hs               |    9 +-
 compiler/cmm/CmmUtils.hs                  |    9 +
 compiler/codeGen/StgCmmBind.hs            |   23 +-
 compiler/codeGen/StgCmmLayout.hs          |   86 +++++-
 compiler/codeGen/StgCmmProf.hs            |   11 +-
 compiler/coreSyn/CoreUtils.lhs            |    4 +-
 compiler/coreSyn/MkCore.lhs               |   19 +-
 compiler/deSugar/Desugar.lhs              |   34 +--
 compiler/deSugar/DsArrows.lhs             |    2 +-
 compiler/deSugar/DsBinds.lhs              |  126 +++-----
 compiler/deSugar/DsExpr.lhs               |    7 +-
 compiler/deSugar/Match.lhs                |   10 +-
 compiler/ghc.mk                           |  165 ++++++++++-
 compiler/ghci/RtClosureInspect.hs         |   62 ++--
 compiler/hsSyn/Convert.lhs                |    2 +-
 compiler/hsSyn/HsUtils.lhs                |   16 +-
 compiler/main/DynFlags.hs                 |    1 +
 compiler/main/HscMain.hs                  |   55 ++--
 compiler/main/HscTypes.lhs                |   46 ++-
 compiler/main/InteractiveEval.hs          |  118 ++++----
 compiler/prelude/TysWiredIn.lhs-boot      |    2 +-
 compiler/prelude/primops.txt.pp           |    2 +-
 compiler/rename/RnSplice.lhs              |    2 +-
 compiler/simplCore/CoreMonad.lhs          |   16 +-
 compiler/{types => typecheck}/FunDeps.lhs |    0
 compiler/typecheck/Inst.lhs               |    3 +-
 compiler/typecheck/TcArrows.lhs           |    7 +-
 compiler/typecheck/TcBinds.lhs            |    2 +-
 compiler/typecheck/TcCanonical.lhs        |   31 +-
 compiler/typecheck/TcDeriv.lhs            |  352 +++++++++++++----------
 compiler/typecheck/TcEnv.lhs              |  109 +++++--
 compiler/typecheck/TcErrors.lhs           |   24 +-
 compiler/typecheck/TcEvidence.lhs         |  321 +++++++++++----------
 compiler/typecheck/TcExpr.lhs             |   10 +-
 compiler/typecheck/TcGenDeriv.lhs         |   66 +++--
 compiler/typecheck/TcHsSyn.lhs            |   55 ++--
 compiler/typecheck/TcInstDcls.lhs         |   26 +-
 compiler/typecheck/TcInteract.lhs         |  197 ++++++++-----
 compiler/typecheck/TcMType.lhs            |   24 +-
 compiler/typecheck/TcPat.lhs              |   16 +-
 compiler/typecheck/TcRnDriver.lhs         |   82 +++---
 compiler/typecheck/TcRnTypes.lhs          |   12 +-
 compiler/typecheck/TcSMonad.lhs           |   30 +-
 compiler/typecheck/TcTyClsDecls.lhs       |  442 +++++++++++++++--------------
 compiler/typecheck/TcTyDecls.lhs          |    5 +-
 compiler/typecheck/TcUnify.lhs            |   18 +-
 compiler/typecheck/TcValidity.lhs         |    2 +-
 compiler/types/Coercion.lhs               |   19 +-
 compiler/types/Type.lhs                   |   36 ++-
 docs/users_guide/extending_ghc.xml        |    2 +-
 docs/users_guide/glasgow_exts.xml         |   13 +-
 rts/sm/GC.c                               |    5 +-
 rts/sm/Storage.c                          |   22 +-
 utils/deriveConstants/DeriveConstants.hs  |    4 +-
 56 files changed, 1630 insertions(+), 1163 deletions(-)