[commit: ghc] cardinality: Merge branch 'master' into cardinality (92043de)

Ilya Sergey ilya.sergey at cs.kuleuven.be
Wed Jan 30 22:31:44 CET 2013


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

On branch  : cardinality

http://hackage.haskell.org/trac/ghc/changeset/92043de137553b5a0a531a3bb6f96d66a434c387

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

commit 92043de137553b5a0a531a3bb6f96d66a434c387
Merge: 78fae51... 6ac7bae...
Author: Ilya Sergey <ilya.sergey at gmail.com>
Date:   Thu Jan 31 01:31:20 2013 +0400

    Merge branch 'master' into cardinality
    
    Conflicts:
    	compiler/basicTypes/Demand.lhs
    	compiler/stranal/DmdAnal.lhs

 aclocal.m4                                        |   32 +-
 compiler/basicTypes/BasicTypes.lhs                |   17 +
 compiler/basicTypes/DataCon.lhs                   |  119 ++---
 compiler/basicTypes/Demand.lhs                    |  553 ++++++++++-----------
 compiler/basicTypes/MkId.lhs                      |   11 +-
 compiler/cmm/CLabel.hs                            |    1 -
 compiler/cmm/CmmInfo.hs                           |  155 ++++++-
 compiler/cmm/CmmLayoutStack.hs                    |    2 +-
 compiler/cmm/CmmParse.y                           |    1 +
 compiler/cmm/PprC.hs                              |    7 +-
 compiler/codeGen/StgCmmBind.hs                    |    1 +
 compiler/codeGen/StgCmmExpr.hs                    |    1 +
 compiler/codeGen/StgCmmLayout.hs                  |  122 +-----
 compiler/codeGen/StgCmmPrim.hs                    |    1 +
 compiler/coreSyn/CoreLint.lhs                     |   12 +-
 compiler/coreSyn/CoreSyn.lhs                      |   12 +-
 compiler/coreSyn/CoreTidy.lhs                     |    3 +-
 compiler/coreSyn/CoreUtils.lhs                    |   24 +-
 compiler/coreSyn/PprCore.lhs                      |    2 +-
 compiler/deSugar/Coverage.lhs                     |    2 +-
 compiler/deSugar/DsCCall.lhs                      |   45 ++-
 compiler/deSugar/DsExpr.lhs                       |    2 +-
 compiler/deSugar/DsForeign.lhs                    |    2 +-
 compiler/ghc.cabal.in                             |    1 -
 compiler/ghci/Debugger.hs                         |    5 +-
 compiler/ghci/DebuggerUtils.hs                    |    2 +-
 compiler/hsSyn/HsExpr.lhs                         |   11 +-
 compiler/hsSyn/HsTypes.lhs                        |    7 +-
 compiler/iface/BinIface.hs                        |   13 +-
 compiler/iface/BuildTyCl.lhs                      |   16 -
 compiler/iface/IfaceSyn.lhs                       |   43 +-
 compiler/iface/MkIface.lhs                        |   23 +-
 compiler/iface/TcIface.lhs                        |   39 +-
 compiler/llvmGen/LlvmCodeGen/Base.hs              |    2 +-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs           |  141 ++++--
 compiler/llvmGen/LlvmCodeGen/Ppr.hs               |    3 +
 compiler/main/DriverPipeline.hs                   |   38 +-
 compiler/main/DynFlags.hs                         |   24 +-
 compiler/main/DynFlags.hs-boot                    |    8 +-
 compiler/main/GHC.hs                              |    5 +-
 compiler/main/HscMain.hs                          |    2 +
 compiler/main/HscStats.lhs                        |  187 -------
 compiler/main/InteractiveEval.hs                  |   14 +-
 compiler/main/Packages.lhs                        |   13 +-
 compiler/main/PprTyThing.hs                       |    8 +-
 compiler/main/StaticFlagParser.hs                 |  151 ------
 compiler/main/StaticFlags.hs                      |  241 +++++++---
 compiler/main/StaticFlags.hs-boot                 |    4 +
 compiler/main/SysTools.lhs                        |   13 +-
 compiler/main/TidyPgm.lhs                         |   31 ++-
 compiler/prelude/PrelNames.lhs                    |    4 +-
 compiler/prelude/PrelRules.lhs                    |    2 +-
 compiler/prelude/TysWiredIn.lhs                   |   48 +-
 compiler/prelude/TysWiredIn.lhs-boot              |    2 +-
 compiler/rename/RnEnv.lhs                         |    2 +-
 compiler/rename/RnExpr.lhs                        |   20 +-
 compiler/rename/RnSource.lhs                      |   16 +-
 compiler/rename/RnTypes.lhs                       |    3 +-
 compiler/simplCore/OccurAnal.lhs                  |    4 +-
 compiler/simplCore/SetLevels.lhs                  |    7 +-
 compiler/simplCore/SimplEnv.lhs                   |   14 +-
 compiler/simplCore/SimplUtils.lhs                 |    2 +-
 compiler/simplCore/Simplify.lhs                   |   37 +-
 compiler/specialise/SpecConstr.lhs                |    2 +-
 compiler/stranal/DmdAnal.lhs                      |   49 ++-
 compiler/stranal/WwLib.lhs                        |  237 +++++-----
 compiler/typecheck/FamInst.lhs                    |  101 ++--
 compiler/typecheck/TcBinds.lhs                    |    1 +
 compiler/typecheck/TcCanonical.lhs                |   11 +-
 compiler/typecheck/TcErrors.lhs                   |   10 +-
 compiler/typecheck/TcExpr.lhs                     |   22 +-
 compiler/typecheck/TcGenGenerics.lhs              |   15 +-
 compiler/typecheck/TcHsSyn.lhs                    |    4 +-
 compiler/typecheck/TcHsType.lhs                   |   23 +-
 compiler/typecheck/TcInstDcls.lhs                 |  282 +++++++----
 compiler/typecheck/TcMType.lhs                    |   13 +-
 compiler/typecheck/TcRnDriver.lhs                 |    6 +-
 compiler/typecheck/TcRnTypes.lhs                  |    7 +-
 compiler/typecheck/TcTyClsDecls.lhs               |  164 +++----
 compiler/typecheck/TcTyDecls.lhs                  |  111 ++++-
 compiler/typecheck/TcType.lhs                     |  155 ------
 compiler/types/Class.lhs                          |   20 +-
 compiler/types/CoAxiom.lhs                        |   31 +-
 compiler/types/Coercion.lhs                       |  202 +++++++--
 compiler/types/FamInstEnv.lhs                     |  152 +-----
 compiler/types/TyCon.lhs                          |   63 ++-
 compiler/types/Type.lhs                           |   40 +-
 compiler/types/TypeRep.lhs                        |  119 +++++
 compiler/utils/Outputable.lhs                     |    5 +-
 compiler/utils/Panic.lhs                          |    7 +-
 compiler/utils/Platform.hs                        |    4 +
 compiler/vectorise/Vectorise/Exp.hs               |   10 +-
 compiler/vectorise/Vectorise/Generic/PAMethods.hs |    4 +-
 compiler/vectorise/Vectorise/Generic/PData.hs     |   12 +-
 compiler/vectorise/Vectorise/Type/TyConDecl.hs    |    1 +
 configure.ac                                      |    6 +-
 distrib/compare/FilenameDescr.hs                  |   17 +-
 distrib/compare/Utils.hs                          |    2 +-
 distrib/compare/compare.hs                        |   65 +++-
 distrib/mkDocs/mkDocs                             |   27 +-
 docs/users_guide/glasgow_exts.xml                 |   78 ++-
 docs/users_guide/intro.xml                        |   57 +--
 docs/users_guide/ug-book.xml.in                   |    2 +-
 ghc.mk                                            |   20 +-
 ghc/InteractiveUI.hs                              |    4 +-
 ghc/Main.hs                                       |    1 -
 includes/Cmm.h                                    |    1 +
 includes/rts/storage/TSO.h                        |    3 +-
 includes/stg/MiscClosures.h                       |    2 +
 libraries/gen_contents_index                      |   24 +-
 rts/Linker.c                                      |   13 +-
 rts/STM.c                                         |   17 +-
 rts/Schedule.h                                    |    2 +-
 rts/StgMiscClosures.cmm                           |   12 +
 rts/ghc.mk                                        |   10 +-
 rts/posix/Itimer.c                                |   18 +
 rts/sm/Scav.c                                     |    2 +-
 sync-all                                          |    2 +-
 118 files changed, 2434 insertions(+), 2167 deletions(-)


Diff suppressed because of size. To see it, use:

    git show 92043de137553b5a0a531a3bb6f96d66a434c387



More information about the ghc-commits mailing list