[commit: ghc] tc-untouchables: Merge remote-tracking branch 'origin/master' into tc-untouchables (08167ac)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : tc-untouchables http://hackage.haskell.org/trac/ghc/changeset/08167aceea615510519440c91fdd294ef5ad8a17 >--------------------------------------------------------------- commit 08167aceea615510519440c91fdd294ef5ad8a17 Merge: 8e7d415... 20670cc... Author: Simon Peyton Jones <[email protected]> Date: Thu Sep 20 12:14:24 2012 +0100 Merge remote-tracking branch 'origin/master' into tc-untouchables compiler/cmm/Bitmap.hs | 14 ++-- compiler/cmm/CmmBuildInfoTables.hs | 8 +- compiler/cmm/CmmInfo.hs | 27 ++++--- compiler/cmm/CmmParse.y | 37 +++++---- compiler/cmm/CmmUtils.hs | 16 ++-- compiler/cmm/PprC.hs | 12 +-- compiler/cmm/PprCmmDecl.hs | 2 +- compiler/cmm/SMRep.lhs | 164 ++++++++++++++++++++++-------------- compiler/codeGen/CgCallConv.hs | 71 ++++++++-------- compiler/codeGen/CgHeapery.lhs | 2 +- compiler/codeGen/CgInfoTbls.hs | 4 +- compiler/codeGen/CgParallel.hs | 6 +- compiler/codeGen/CgProf.hs | 32 ++----- compiler/codeGen/CgUtils.hs | 12 ++-- compiler/codeGen/ClosureInfo.lhs | 24 +++--- compiler/codeGen/StgCmmClosure.hs | 24 +++--- compiler/codeGen/StgCmmLayout.hs | 13 ++-- compiler/codeGen/StgCmmProf.hs | 32 ++----- compiler/codeGen/StgCmmUtils.hs | 4 +- compiler/ghci/ByteCodeAsm.lhs | 8 +- compiler/ghci/ByteCodeInstr.lhs | 2 +- compiler/ghci/DebuggerUtils.hs | 15 +++- includes/mkDerivedConstants.c | 75 +++++++++++++---- 23 files changed, 340 insertions(+), 264 deletions(-)