[commit: ghc] master: Merge remote-tracking branch 'origin/unboxed-tuple-arguments2' (0076786)

Paolo Capriotti p.capriotti at gmail.com
Tue Jun 5 17:47:15 CEST 2012


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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0076786de1c4450743803be8b23a0f3e5c47e4ee

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

commit 0076786de1c4450743803be8b23a0f3e5c47e4ee
Merge: eb02ad9... 09987de...
Author: Paolo Capriotti <p.capriotti at gmail.com>
Date:   Tue Jun 5 16:47:02 2012 +0100

    Merge remote-tracking branch 'origin/unboxed-tuple-arguments2'

 compiler/basicTypes/BasicTypes.lhs |   13 +++-
 compiler/basicTypes/DataCon.lhs    |    9 ++-
 compiler/basicTypes/Id.lhs         |   10 +-
 compiler/cmm/CmmUtils.hs           |    6 +-
 compiler/codeGen/CgBindery.lhs     |    9 +--
 compiler/codeGen/CgCon.lhs         |    8 +-
 compiler/codeGen/CgExpr.lhs        |    2 +-
 compiler/codeGen/CgForeignCall.hs  |    3 +-
 compiler/codeGen/ClosureInfo.lhs   |   35 +++++---
 compiler/codeGen/StgCmm.hs         |    4 +-
 compiler/codeGen/StgCmmClosure.hs  |   31 ++++---
 compiler/codeGen/StgCmmCon.hs      |    2 +-
 compiler/codeGen/StgCmmEnv.hs      |    1 -
 compiler/codeGen/StgCmmExpr.hs     |    2 +-
 compiler/codeGen/StgCmmForeign.hs  |    3 +-
 compiler/codeGen/StgCmmLayout.hs   |    8 +-
 compiler/codeGen/StgCmmTicky.hs    |    6 +-
 compiler/codeGen/StgCmmUtils.hs    |    2 +-
 compiler/coreSyn/CoreLint.lhs      |   18 +----
 compiler/deSugar/DsExpr.lhs        |   31 +------
 compiler/deSugar/DsForeign.lhs     |   13 ++-
 compiler/ghc.cabal.in              |    1 +
 compiler/ghci/ByteCodeGen.lhs      |   32 +++++---
 compiler/ghci/ByteCodeItbls.lhs    |    3 +-
 compiler/ghci/RtClosureInspect.hs  |  119 +++++++++++++++++---------
 compiler/main/InteractiveEval.hs   |    7 +-
 compiler/parser/ParserCore.y       |    2 +-
 compiler/prelude/PrelNames.lhs     |    5 +-
 compiler/prelude/TysPrim.lhs       |   31 +------
 compiler/prelude/TysWiredIn.lhs    |    4 +-
 compiler/simplCore/CSE.lhs         |   30 +------
 compiler/simplStg/SimplStg.lhs     |    6 +-
 compiler/simplStg/UnariseStg.lhs   |  167 ++++++++++++++++++++++++++++++++++++
 compiler/stgSyn/CoreToStg.lhs      |   27 +++---
 compiler/stgSyn/StgLint.lhs        |   37 +++++----
 compiler/stgSyn/StgSyn.lhs         |   47 +++++------
 compiler/typecheck/TcBinds.lhs     |    4 +-
 compiler/typecheck/TcDeriv.lhs     |    2 +-
 compiler/typecheck/TcExpr.lhs      |    4 +-
 compiler/typecheck/TcHsType.lhs    |   16 ++--
 compiler/typecheck/TcMType.lhs     |   56 ++++--------
 compiler/typecheck/TcPat.lhs       |   32 +------
 compiler/typecheck/TcType.lhs      |    4 +-
 compiler/typecheck/TcUnify.lhs     |    2 +-
 compiler/types/Kind.lhs            |   45 ++--------
 compiler/types/Type.lhs            |   92 +++++++++++---------
 compiler/types/TypeRep.lhs         |    4 +-
 compiler/utils/Util.lhs            |   12 +++-
 48 files changed, 551 insertions(+), 456 deletions(-)






More information about the Cvs-ghc mailing list