[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (4202879)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/4202879d1270c2ada80ecaff83072a127ed8bd86

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

commit 4202879d1270c2ada80ecaff83072a127ed8bd86
Merge: 84a9c46... f7c2657...
Author: Ian Lynagh <igloo at earth.li>
Date:   Wed May 2 18:01:32 2012 +0100

    Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

 compiler/cmm/PprC.hs               |   41 ++++++++++------
 compiler/coreSyn/CoreArity.lhs     |   10 +++-
 compiler/coreSyn/CoreFVs.lhs       |    2 +-
 compiler/coreSyn/CoreLint.lhs      |    8 ---
 compiler/coreSyn/CoreSyn.lhs       |   53 ++++++++++++++++++++-
 compiler/coreSyn/CoreUnfold.lhs    |    4 +-
 compiler/coreSyn/MkCore.lhs        |   12 ++++-
 compiler/iface/BinIface.hs         |    7 +++
 compiler/iface/IfaceSyn.lhs        |   14 +++++-
 compiler/iface/MkIface.lhs         |    4 +-
 compiler/iface/TcIface.lhs         |    6 ++
 compiler/simplCore/OccurAnal.lhs   |    2 +-
 compiler/simplCore/SimplCore.lhs   |   10 ++--
 compiler/simplCore/SimplUtils.lhs  |   56 +++++++++++-----------
 compiler/simplCore/Simplify.lhs    |   93 ++++++++++++++++++------------------
 compiler/specialise/SpecConstr.lhs |    4 +-
 compiler/specialise/Specialise.lhs |    8 ++--
 compiler/stgSyn/CoreToStg.lhs      |   12 +++++
 compiler/stranal/DmdAnal.lhs       |    2 +-
 19 files changed, 226 insertions(+), 122 deletions(-)