[commit: ghc] ghc-lwc2: Merging master. Untested. (41c44e4)

Ian Lynagh igloo at earth.li
Thu Feb 28 15:19:25 CET 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : ghc-lwc2

http://hackage.haskell.org/trac/ghc/changeset/41c44e4db3105d8f4bc78ffcd4fc30764ab788d8

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

commit 41c44e4db3105d8f4bc78ffcd4fc30764ab788d8
Merge: 44ccc07 96ce0b0
Author: KC Sivaramakrishnan <chandras at cs.purdue.edu>
Date:   Thu Feb 21 15:49:12 2013 -0500

    Merging master. Untested.

 .gitignore                                         |  112 +-
 .gitmodules                                        |   42 +
 README                                             |  104 --
 README.md                                          |  100 ++
 aclocal.m4                                         |  431 +++--
 boot                                               |   43 -
 compiler/basicTypes/BasicTypes.lhs                 |  103 +-
 compiler/basicTypes/DataCon.lhs                    |  494 +++---
 compiler/basicTypes/DataCon.lhs-boot               |    3 +
 compiler/basicTypes/Demand.lhs                     | 1189 ++++++++++---
 compiler/basicTypes/Id.lhs                         |  320 ++--
 compiler/basicTypes/IdInfo.lhs                     |   58 +-
 compiler/basicTypes/Literal.lhs                    |   59 +-
 compiler/basicTypes/MkId.lhs                       |  790 +++++----
 compiler/basicTypes/MkId.lhs-boot                  |   10 +-
 compiler/basicTypes/Module.lhs                     |    8 +
 compiler/basicTypes/Name.lhs                       |  284 +--
 compiler/basicTypes/OccName.lhs                    |   63 +-
 compiler/basicTypes/RdrName.lhs                    |   27 +-
 compiler/basicTypes/SrcLoc.lhs                     |    4 +-
 compiler/basicTypes/Var.lhs                        |    6 +-
 compiler/basicTypes/VarEnv.lhs                     |    3 +
 compiler/cmm/Bitmap.hs                             |   53 +-
 compiler/cmm/CLabel.hs                             |   47 +-
 compiler/cmm/Cmm.hs                                |   67 +-
 compiler/cmm/CmmBuildInfoTables.hs                 |  162 +-
 compiler/cmm/CmmCallConv.hs                        |  212 ++-
 compiler/cmm/CmmCommonBlockElim.hs                 |    1 +
 compiler/cmm/CmmContFlowOpt.hs                     |  148 +-
 compiler/cmm/CmmCvt.hs                             |  110 --
 compiler/cmm/CmmExpr.hs                            |  338 ++--
 compiler/cmm/CmmInfo.hs                            |  373 ++--
 compiler/cmm/CmmLayoutStack.hs                     |  340 ++--
 compiler/cmm/CmmLex.x                              |   19 +-
 compiler/cmm/CmmLint.hs                            |   93 +-
 compiler/cmm/CmmLive.hs                            |   78 +-
 compiler/cmm/CmmMachOp.hs                          |  241 ++-
 compiler/cmm/CmmNode.hs                            |  163 +-
 compiler/cmm/CmmOpt.hs                             |  413 +----
 compiler/cmm/CmmParse.y                            | 1691 ++++++++++--------
 compiler/cmm/CmmPipeline.hs                        |  228 ++-
 compiler/cmm/CmmProcPoint.hs                       |  111 +-
 compiler/cmm/CmmRewriteAssignments.hs              |  118 +-
 compiler/cmm/CmmSink.hs                            |  670 ++++++--
 compiler/cmm/CmmType.hs                            |  194 ++-
 compiler/cmm/CmmUtils.hs                           |  402 +++--
 compiler/cmm/MkGraph.hs                            |  334 ++--
 compiler/cmm/OldCmm.hs                             |  273 ---
 compiler/cmm/OldCmmLint.hs                         |  209 ---
 compiler/cmm/OldCmmUtils.hs                        |   99 --
 compiler/cmm/OldPprCmm.hs                          |  227 ---
 compiler/cmm/PprC.hs                               |  436 +++--
 compiler/cmm/PprCmm.hs                             |   22 +-
 compiler/cmm/PprCmmDecl.hs                         |   17 +-
 compiler/cmm/PprCmmExpr.hs                         |   13 +-
 compiler/cmm/SMRep.lhs                             |  305 ++--
 compiler/codeGen/CgBindery.lhs                     |  557 ------
 compiler/codeGen/CgBindery.lhs-boot                |   11 -
 compiler/codeGen/CgCallConv.hs                     |  396 -----
 compiler/codeGen/CgCase.lhs                        |  670 --------
 compiler/codeGen/CgCon.lhs                         |  486 ------
 compiler/codeGen/CgExpr.lhs                        |  491 ------
 compiler/codeGen/CgExpr.lhs-boot                   |    7 -
 compiler/codeGen/CgExtCode.hs                      |  236 ---
 compiler/codeGen/CgHeapery.lhs                     |  624 -------
 compiler/codeGen/CgHpc.hs                          |   39 -
 compiler/codeGen/CgInfoTbls.hs                     |  367 ----
 compiler/codeGen/CgLetNoEscape.lhs                 |  214 ---
 compiler/codeGen/CgMonad.lhs                       |  844 ---------
 compiler/codeGen/CgParallel.hs                     |  102 --
 compiler/codeGen/CgPrimOp.hs                       | 1137 ------------
 compiler/codeGen/CgProf.hs                         |  325 ----
 compiler/codeGen/CgStackery.lhs                    |  361 ----
 compiler/codeGen/CgTailCall.lhs                    |  505 ------
 compiler/codeGen/CgTicky.hs                        |  398 -----
 compiler/codeGen/CgUtils.hs                        | 1100 ++----------
 compiler/codeGen/ClosureInfo.lhs                   | 1118 ------------
 compiler/codeGen/ClosureInfo.lhs-boot              |    6 -
 compiler/codeGen/CodeGen.lhs                       |  235 ---
 compiler/codeGen/CodeGen/Platform.hs               |  111 ++
 compiler/codeGen/CodeGen/Platform/ARM.hs           |    7 +
 compiler/codeGen/CodeGen/Platform/NoRegs.hs        |    6 +
 compiler/codeGen/CodeGen/Platform/PPC.hs           |    7 +
 compiler/codeGen/CodeGen/Platform/PPC_Darwin.hs    |    8 +
 compiler/codeGen/CodeGen/Platform/SPARC.hs         |    7 +
 compiler/codeGen/CodeGen/Platform/X86.hs           |    7 +
 compiler/codeGen/CodeGen/Platform/X86_64.hs        |    7 +
 compiler/codeGen/StgCmm.hs                         |  149 +-
 compiler/codeGen/StgCmmBind.hs                     |  649 ++++---
 compiler/codeGen/StgCmmClosure.hs                  |  162 +-
 compiler/codeGen/StgCmmCon.hs                      |  132 +-
 compiler/codeGen/StgCmmEnv.hs                      |   78 +-
 compiler/codeGen/StgCmmExpr.hs                     |  480 +++---
 compiler/codeGen/StgCmmExtCode.hs                  |  224 +++
 compiler/codeGen/StgCmmForeign.hs                  |  216 +--
 compiler/codeGen/StgCmmGran.hs                     |    8 +-
 compiler/codeGen/StgCmmHeap.hs                     |  412 +++--
 compiler/codeGen/StgCmmHpc.hs                      |   23 +-
 compiler/codeGen/StgCmmLayout.hs                   |  358 ++--
 compiler/codeGen/StgCmmMonad.hs                    |  342 ++--
 compiler/codeGen/StgCmmPrim.hs                     | 1444 ++++++++++------
 compiler/codeGen/StgCmmProf.hs                     |  284 ++-
 compiler/codeGen/StgCmmTicky.hs                    |   67 +-
 compiler/codeGen/StgCmmUtils.hs                    |  621 +++----
 compiler/coreSyn/CoreArity.lhs                     |   16 +-
 compiler/coreSyn/CoreFVs.lhs                       |   11 +-
 compiler/coreSyn/CoreLint.lhs                      |  120 +-
 compiler/coreSyn/CorePrep.lhs                      |   82 +-
 compiler/coreSyn/CoreSubst.lhs                     |   26 +-
 compiler/coreSyn/CoreSyn.lhs                       |   78 +-
 compiler/coreSyn/CoreTidy.lhs                      |    7 +-
 compiler/coreSyn/CoreUnfold.lhs                    |  127 +-
 compiler/coreSyn/CoreUtils.lhs                     |  202 ++-
 compiler/coreSyn/ExternalCore.lhs                  |    4 +
 compiler/coreSyn/MkCore.lhs                        |   36 +-
 compiler/coreSyn/MkExternalCore.lhs                |   18 +-
 compiler/coreSyn/PprCore.lhs                       |  105 +-
 compiler/coreSyn/PprExternalCore.lhs               |   62 +-
 compiler/coreSyn/TrieMap.lhs                       |  213 ++-
 compiler/deSugar/Check.lhs                         |   24 +-
 compiler/deSugar/Coverage.lhs                      |  228 ++-
 compiler/deSugar/Desugar.lhs                       |   20 +-
 compiler/deSugar/DsArrows.lhs                      |  207 +--
 compiler/deSugar/DsBinds.lhs                       |   61 +-
 compiler/deSugar/DsCCall.lhs                       |   74 +-
 compiler/deSugar/DsExpr.lhs                        |   93 +-
 compiler/deSugar/DsForeign.lhs                     |   57 +-
 compiler/deSugar/DsGRHSs.lhs                       |   39 +-
 compiler/deSugar/DsListComp.lhs                    |   49 +-
 compiler/deSugar/DsMeta.hs                         |  614 ++++---
 compiler/deSugar/DsMonad.lhs                       |   11 +-
 compiler/deSugar/DsUtils.lhs                       |   61 +-
 compiler/deSugar/Match.lhs                         |  166 +-
 compiler/deSugar/Match.lhs-boot                    |    4 +-
 compiler/deSugar/MatchCon.lhs                      |    9 +-
 compiler/deSugar/MatchLit.lhs                      |   53 +-
 compiler/ghc.cabal.in                              |   62 +-
 compiler/ghc.mk                                    |  294 ++--
 compiler/ghci/ByteCodeAsm.lhs                      |  125 +-
 compiler/ghci/ByteCodeGen.lhs                      |  278 +--
 compiler/ghci/ByteCodeInstr.lhs                    |    8 +-
 compiler/ghci/ByteCodeItbls.lhs                    |   93 +-
 compiler/ghci/ByteCodeLink.lhs                     |   41 +-
 compiler/ghci/Debugger.hs                          |   13 +-
 compiler/ghci/DebuggerUtils.hs                     |   30 +-
 compiler/ghci/LibFFI.hsc                           |   53 +-
 compiler/ghci/Linker.lhs                           |  262 +--
 compiler/ghci/RtClosureInspect.hs                  |   66 +-
 compiler/ghci/keepCAFsForGHCi.c                    |    5 +-
 compiler/hsSyn/Convert.lhs                         |  580 ++++---
 compiler/hsSyn/HsBinds.lhs                         |   20 +-
 compiler/hsSyn/HsDecls.lhs                         |  527 +++---
 compiler/hsSyn/HsExpr.lhs                          |  590 ++++---
 compiler/hsSyn/HsExpr.lhs-boot                     |   43 +-
 compiler/hsSyn/HsLit.lhs                           |    3 +-
 compiler/hsSyn/HsPat.lhs                           |   12 +-
 compiler/hsSyn/HsPat.lhs-boot                      |    8 +-
 compiler/hsSyn/HsSyn.lhs                           |   77 +-
 compiler/hsSyn/HsTypes.lhs                         |   10 +-
 compiler/hsSyn/HsUtils.lhs                         |  115 +-
 compiler/iface/BinIface.hs                         |  198 +--
 compiler/iface/BuildTyCl.lhs                       |   46 +-
 compiler/iface/FlagChecker.hs                      |    3 +-
 compiler/iface/IfaceSyn.lhs                        |  163 +-
 compiler/iface/IfaceType.lhs                       |   90 +-
 compiler/iface/LoadIface.lhs                       |  234 +--
 compiler/iface/MkIface.lhs                         |  155 +-
 compiler/iface/TcIface.lhs                         |  197 ++-
 compiler/iface/TcIface.lhs-boot                    |    4 +-
 compiler/llvmGen/Llvm.hs                           |    2 +-
 compiler/llvmGen/Llvm/AbsSyn.hs                    |   15 +
 compiler/llvmGen/Llvm/PpLlvm.hs                    |   39 +-
 compiler/llvmGen/Llvm/Types.hs                     |  139 +-
 compiler/llvmGen/LlvmCodeGen.hs                    |   28 +-
 compiler/llvmGen/LlvmCodeGen/Base.hs               |   95 +-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs            |  746 +++++---
 compiler/llvmGen/LlvmCodeGen/Data.hs               |   32 +-
 compiler/llvmGen/LlvmCodeGen/Ppr.hs                |   77 +-
 compiler/llvmGen/LlvmCodeGen/Regs.hs               |   30 +-
 compiler/main/BreakArray.hs                        |   46 +-
 compiler/main/CmdLineParser.hs                     |   32 +-
 compiler/main/CodeOutput.lhs                       |   27 +-
 compiler/main/Constants.lhs                        |   27 +-
 compiler/main/DriverMkDepend.hs                    |   46 +-
 compiler/main/DriverPhases.hs                      |  100 +-
 compiler/main/DriverPipeline.hs                    |  697 ++++----
 compiler/main/DynFlags.hs                          | 1238 +++++++++----
 compiler/main/DynFlags.hs-boot                     |   10 +-
 compiler/main/DynamicLoading.hs                    |   11 +-
 compiler/main/ErrUtils.lhs                         |   75 +-
 compiler/main/Finder.lhs                           |    2 +-
 compiler/main/GHC.hs                               |   71 +-
 compiler/main/GhcMake.hs                           |   35 +-
 compiler/main/GhcMonad.hs                          |   10 +-
 compiler/main/HeaderInfo.hs                        |    2 +-
 compiler/main/HscMain.hs                           |  135 +-
 compiler/main/HscStats.hs                          |   19 +-
 compiler/main/HscStats.lhs                         |  187 --
 compiler/main/HscTypes.lhs                         |  143 +-
 compiler/main/InteractiveEval.hs                   |  103 +-
 compiler/main/Packages.lhs                         |   38 +-
 compiler/main/PlatformConstants.hs                 |   12 +
 compiler/main/PprTyThing.hs                        |   45 +-
 compiler/main/StaticFlagParser.hs                  |  239 ---
 compiler/main/StaticFlags.hs                       |  613 ++-----
 compiler/main/StaticFlags.hs-boot                  |    4 +
 compiler/main/SysTools.lhs                         |  510 ++++--
 compiler/main/TidyPgm.lhs                          |  394 +++--
 compiler/nativeGen/AsmCodeGen.lhs                  |  588 ++++---
 compiler/nativeGen/CPrim.hs                        |   12 +-
 compiler/nativeGen/Instruction.hs                  |   38 +-
 compiler/nativeGen/NCGMonad.hs                     |  105 +-
 compiler/nativeGen/PIC.hs                          |  529 +++---
 compiler/nativeGen/PPC/CodeGen.hs                  |  175 +-
 compiler/nativeGen/PPC/Instr.hs                    |  694 +++++---
 compiler/nativeGen/PPC/Ppr.hs                      |  495 +++---
 compiler/nativeGen/PPC/RegInfo.hs                  |    9 +-
 compiler/nativeGen/PPC/Regs.hs                     |  518 ++----
 compiler/nativeGen/PprInstruction.hs               |    2 -
 compiler/nativeGen/RegAlloc/Graph/ArchBase.hs      |  196 +--
 compiler/nativeGen/RegAlloc/Graph/ArchX86.hs       |  188 +-
 compiler/nativeGen/RegAlloc/Graph/Coalesce.hs      |  110 +-
 compiler/nativeGen/RegAlloc/Graph/Main.hs          |  244 +--
 compiler/nativeGen/RegAlloc/Graph/Spill.hs         |  220 ++-
 compiler/nativeGen/RegAlloc/Graph/SpillClean.hs    |  802 ++++-----
 compiler/nativeGen/RegAlloc/Graph/SpillCost.hs     |  369 ++--
 compiler/nativeGen/RegAlloc/Graph/Stats.hs         |  464 ++---
 compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs |   12 +
 compiler/nativeGen/RegAlloc/Linear/Base.hs         |   10 +-
 compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs     |   70 +-
 .../nativeGen/RegAlloc/Linear/JoinToTargets.hs     |  449 +++--
 compiler/nativeGen/RegAlloc/Linear/Main.hs         |  353 ++--
 compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs |   20 +-
 .../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs    |  260 ++-
 compiler/nativeGen/RegAlloc/Linear/StackMap.hs     |   80 +-
 compiler/nativeGen/RegAlloc/Linear/State.hs        |  121 +-
 compiler/nativeGen/RegAlloc/Linear/Stats.hs        |  111 +-
 compiler/nativeGen/RegAlloc/Linear/X86/FreeRegs.hs |   55 +-
 .../nativeGen/RegAlloc/Linear/X86_64/FreeRegs.hs   |   52 +
 compiler/nativeGen/RegAlloc/Liveness.hs            |  160 +-
 compiler/nativeGen/SPARC/Base.hs                   |   55 +-
 compiler/nativeGen/SPARC/CodeGen.hs                |  121 +-
 compiler/nativeGen/SPARC/CodeGen/Amode.hs          |    5 +-
 compiler/nativeGen/SPARC/CodeGen/Base.hs           |   23 +-
 compiler/nativeGen/SPARC/CodeGen/CondCode.hs       |    7 +-
 compiler/nativeGen/SPARC/CodeGen/Expand.hs         |    6 +-
 compiler/nativeGen/SPARC/CodeGen/Gen32.hs          |   17 +-
 compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot     |    2 +-
 compiler/nativeGen/SPARC/CodeGen/Gen64.hs          |    2 +-
 compiler/nativeGen/SPARC/CodeGen/Sanity.hs         |    4 +-
 compiler/nativeGen/SPARC/Imm.hs                    |    6 +-
 compiler/nativeGen/SPARC/Instr.hs                  |   38 +-
 compiler/nativeGen/SPARC/Ppr.hs                    |  101 +-
 compiler/nativeGen/SPARC/RegPlate.hs               |  318 ----
 compiler/nativeGen/SPARC/Regs.hs                   |  130 +-
 compiler/nativeGen/SPARC/ShortcutJump.hs           |    2 +-
 compiler/nativeGen/SPARC/Stack.hs                  |   15 +-
 compiler/nativeGen/Size.hs                         |    2 +-
 compiler/nativeGen/TargetReg.hs                    |   25 +-
 compiler/nativeGen/X86/CodeGen.hs                  |  657 ++++---
 compiler/nativeGen/X86/Cond.hs                     |   69 +-
 compiler/nativeGen/X86/Instr.hs                    |  240 ++-
 compiler/nativeGen/X86/Ppr.hs                      |  174 +-
 compiler/nativeGen/X86/Regs.hs                     |  392 +----
 compiler/parser/Lexer.x                            |   30 +-
 compiler/parser/Parser.y.pp                        |  243 ++-
 compiler/parser/ParserCore.y                       |   22 +-
 compiler/parser/RdrHsSyn.lhs                       |  336 ++--
 compiler/prelude/ForeignCall.lhs                   |   11 +-
 compiler/prelude/PrelNames.lhs                     |  144 +-
 compiler/prelude/PrelNames.lhs-boot                |   10 +
 compiler/prelude/PrelRules.lhs                     | 1036 ++++++-----
 compiler/prelude/PrimOp.lhs                        |   15 +-
 compiler/prelude/TysPrim.lhs                       |   77 +-
 compiler/prelude/TysWiredIn.lhs                    |   77 +-
 compiler/prelude/TysWiredIn.lhs-boot               |    1 +
 compiler/prelude/primops.txt.pp                    |  601 ++++++-
 compiler/profiling/ProfInit.hs                     |    9 +-
 compiler/profiling/SCCfinal.lhs                    |    4 +-
 compiler/rename/RnBinds.lhs                        |  141 +-
 compiler/rename/RnEnv.lhs                          |  126 +-
 compiler/rename/RnExpr.lhs                         |  458 ++---
 compiler/rename/RnExpr.lhs-boot                    |   16 +-
 compiler/rename/RnNames.lhs                        |  335 ++--
 compiler/rename/RnPat.lhs                          |   47 +-
 compiler/rename/RnSource.lhs                       |  745 ++++----
 compiler/rename/RnTypes.lhs                        |   68 +-
 compiler/simplCore/CSE.lhs                         |   15 +-
 compiler/simplCore/CoreMonad.lhs                   |   41 +-
 compiler/simplCore/FloatIn.lhs                     |  105 +-
 compiler/simplCore/FloatOut.lhs                    |   12 +-
 compiler/simplCore/LiberateCase.lhs                |   15 +-
 compiler/simplCore/OccurAnal.lhs                   |  549 +++---
 compiler/simplCore/SetLevels.lhs                   |   30 +-
 compiler/simplCore/SimplCore.lhs                   |   85 +-
 compiler/simplCore/SimplEnv.lhs                    |  434 ++---
 compiler/simplCore/SimplMonad.lhs                  |   91 +-
 compiler/simplCore/SimplUtils.lhs                  | 1057 ++++++------
 compiler/simplCore/Simplify.lhs                    |  609 ++++---
 compiler/simplStg/SRT.lhs                          |  165 --
 compiler/simplStg/SimplStg.lhs                     |  116 +-
 compiler/simplStg/UnariseStg.lhs                   |  152 +-
 compiler/specialise/Rules.lhs                      |   36 +-
 compiler/specialise/SpecConstr.lhs                 | 1159 +++++++------
 compiler/specialise/Specialise.lhs                 |  413 +++--
 compiler/stgSyn/CoreToStg.lhs                      |   13 +-
 compiler/stgSyn/StgLint.lhs                        |    2 +-
 compiler/stgSyn/StgSyn.lhs                         |   34 +-
 compiler/stranal/DmdAnal.lhs                       | 1212 +++++--------
 compiler/stranal/WorkWrap.lhs                      |   68 +-
 compiler/stranal/WwLib.lhs                         |  283 +--
 compiler/typecheck/FamInst.lhs                     |  133 +-
 compiler/typecheck/Inst.lhs                        |  337 ++--
 compiler/typecheck/TcArrows.lhs                    |  108 +-
 compiler/typecheck/TcBinds.lhs                     |  206 ++-
 compiler/typecheck/TcCanonical.lhs                 |  949 +++++-----
 compiler/typecheck/TcClassDcl.lhs                  |   38 +-
 compiler/typecheck/TcDeriv.lhs                     | 1305 ++++++++------
 compiler/typecheck/TcEnv.lhs                       |   80 +-
 compiler/typecheck/TcErrors.lhs                    | 1090 ++++++------
 compiler/typecheck/TcEvidence.lhs                  |  167 +-
 compiler/typecheck/TcExpr.lhs                      |  177 +-
 compiler/typecheck/TcForeign.lhs                   |  196 ++-
 compiler/typecheck/TcGenDeriv.lhs                  | 1484 ++++++++--------
 compiler/typecheck/TcGenGenerics.lhs               |   69 +-
 compiler/typecheck/TcHsSyn.lhs                     |  321 ++--
 compiler/typecheck/TcHsType.lhs                    |  386 +++--
 compiler/typecheck/TcInstDcls.lhs                  |  375 ++--
 compiler/typecheck/TcInteract.lhs                  |  999 +++++------
 compiler/typecheck/TcMType.lhs                     | 1377 +++------------
 compiler/typecheck/TcMatches.lhs                   |  155 +-
 compiler/typecheck/TcMatches.lhs-boot              |   11 +-
 compiler/typecheck/TcPat.lhs                       |   38 +-
 compiler/typecheck/TcRnDriver.lhs                  | 1220 ++++++-------
 compiler/typecheck/TcRnMonad.lhs                   |  151 +-
 compiler/typecheck/TcRnTypes.lhs                   | 1025 +++++------
 compiler/typecheck/TcRules.lhs                     |   42 +-
 compiler/typecheck/TcSMonad.lhs                    | 1344 ++++++++-------
 compiler/typecheck/TcSimplify.lhs                  | 1455 ++++++----------
 compiler/typecheck/TcSplice.lhs                    |  113 +-
 compiler/typecheck/TcSplice.lhs-boot               |    2 +-
 compiler/typecheck/TcTyClsDecls.lhs                |  820 +++++----
 compiler/typecheck/TcTyDecls.lhs                   |  129 +-
 compiler/typecheck/TcType.lhs                      |  522 +++---
 compiler/typecheck/TcUnify.lhs                     |  572 ++++---
 compiler/typecheck/TcUnify.lhs-boot                |    3 +-
 compiler/typecheck/TcValidity.lhs                  | 1237 +++++++++++++
 compiler/types/Class.lhs                           |   20 +-
 compiler/types/CoAxiom.lhs                         |  355 ++++
 compiler/types/Coercion.lhs                        |  364 +++-
 compiler/types/FamInstEnv.lhs                      |  883 ++++++----
 compiler/types/FunDeps.lhs                         |  157 +-
 compiler/types/InstEnv.lhs                         |  143 +-
 compiler/types/Kind.lhs                            |   69 +-
 compiler/types/OptCoercion.lhs                     |  213 ++-
 compiler/types/TyCon.lhs                           |  390 +++--
 compiler/types/Type.lhs                            |  138 +-
 compiler/types/TypeRep.lhs                         |  188 +-
 compiler/types/Unify.lhs                           |  168 +-
 compiler/utils/Bag.lhs                             |    1 +
 compiler/utils/Binary.hs                           |   36 +-
 compiler/utils/BufWrite.hs                         |   31 +-
 compiler/utils/Exception.hs                        |   29 +-
 compiler/utils/FastString.lhs                      |  240 +--
 compiler/utils/Fingerprint.hsc                     |    7 -
 compiler/utils/IOEnv.hs                            |    5 +
 compiler/utils/ListSetOps.lhs                      |   18 +
 compiler/utils/Maybes.lhs                          |    9 -
 compiler/utils/MonadUtils.hs                       |   32 +-
 compiler/utils/Outputable.lhs                      |   63 +-
 compiler/utils/Panic.lhs                           |   13 +-
 compiler/utils/Platform.hs                         |   34 +-
 compiler/utils/Serialized.hs                       |   10 +
 compiler/utils/UniqFM.lhs                          |  180 +-
 compiler/utils/Util.lhs                            |   29 +-
 compiler/vectorise/Vectorise.hs                    |  400 ++---
 compiler/vectorise/Vectorise/Builtins/Base.hs      |    3 +-
 .../vectorise/Vectorise/Builtins/Initialise.hs     |    8 +-
 compiler/vectorise/Vectorise/Convert.hs            |   22 +-
 compiler/vectorise/Vectorise/Env.hs                |  123 +-
 compiler/vectorise/Vectorise/Exp.hs                | 1249 ++++++++------
 compiler/vectorise/Vectorise/Generic/PADict.hs     |   14 +-
 compiler/vectorise/Vectorise/Generic/PAMethods.hs  |   22 +-
 compiler/vectorise/Vectorise/Generic/PData.hs      |   31 +-
 compiler/vectorise/Vectorise/Monad.hs              |   29 +-
 compiler/vectorise/Vectorise/Monad/Base.hs         |    2 +-
 compiler/vectorise/Vectorise/Monad/Global.hs       |   73 +-
 compiler/vectorise/Vectorise/Monad/InstEnv.hs      |   17 +-
 compiler/vectorise/Vectorise/Monad/Local.hs        |  117 +-
 compiler/vectorise/Vectorise/Monad/Naming.hs       |    5 +-
 compiler/vectorise/Vectorise/Type/Classify.hs      |   51 +-
 compiler/vectorise/Vectorise/Type/Env.hs           |  241 +--
 compiler/vectorise/Vectorise/Type/TyConDecl.hs     |    5 +-
 compiler/vectorise/Vectorise/Type/Type.hs          |   13 +-
 compiler/vectorise/Vectorise/Utils.hs              |   25 +-
 compiler/vectorise/Vectorise/Utils/Base.hs         |   21 +-
 compiler/vectorise/Vectorise/Utils/PADict.hs       |   11 +-
 configure.ac                                       |  376 ++--
 distrib/MacFrameworks/Makefile                     |   31 -
 distrib/MacFrameworks/README                       |   13 -
 distrib/MacFrameworks/build-framework-gmp.sh       |   48 -
 distrib/MacFrameworks/build-framework-readline.sh  |   63 -
 distrib/MacOS/English.lproj/InfoPlist.strings      |  Bin 136 -> 0 bytes
 .../MacOS/GHC-relocatable.pmdoc/01ghc-contents.xml |    1 -
 distrib/MacOS/GHC-relocatable.pmdoc/01ghc.xml      |    1 -
 distrib/MacOS/GHC-relocatable.pmdoc/index.xml      |   21 -
 distrib/MacOS/GHC-system.pmdoc/01ghc.xml           |    1 -
 distrib/MacOS/GHC-system.pmdoc/index.xml.in        |   31 -
 distrib/MacOS/GHC.xcodeproj/project.pbxproj        |  310 ----
 distrib/MacOS/Info.plist                           |   28 -
 distrib/MacOS/installer-docs/lambda-logo.png       |  Bin 10511 -> 0 bytes
 distrib/MacOS/installer-docs/license.html          |  244 ---
 distrib/MacOS/installer-scripts/Uninstaller.in     |   91 -
 distrib/MacOS/installer-scripts/create-links.in    |   38 -
 distrib/MacOS/installer-scripts/relocate           |   14 -
 distrib/MacOS/mkinstaller                          |  105 --
 distrib/compare/FilenameDescr.hs                   |   17 +-
 distrib/compare/Utils.hs                           |    2 +-
 distrib/compare/compare.hs                         |   65 +-
 distrib/configure.ac.in                            |   25 +-
 distrib/cvs-build                                  |  137 --
 distrib/fake-happy                                 |   20 -
 distrib/mkDocs/mkDocs                              |   27 +-
 distrib/prep-bin-dist-mingw                        |  203 ---
 distrib/prep-bin-dist-mingw-alex                   |   32 -
 distrib/prep-bin-dist-mingw-args                   |   33 -
 distrib/prep-bin-dist-mingw-greencard              |   33 -
 distrib/prep-bin-dist-mingw-haddock                |   32 -
 distrib/prep-bin-dist-mingw-happy                  |   32 -
 distrib/prep-bin-dist-mingw-hdirect                |   36 -
 docs/core-spec/.gitignore                          |    5 +
 docs/core-spec/CoreLint.ott                        |  418 +++++
 docs/core-spec/CoreSyn.ott                         |  296 ++++
 docs/core-spec/Makefile                            |   17 +
 docs/core-spec/README                              |   83 +
 docs/core-spec/core-spec.mng                       |  321 ++++
 docs/core-spec/core-spec.pdf                       |  Bin 0 -> 308357 bytes
 docs/storage-mgt/rp.tex                            |    2 +-
 docs/users_guide/7.6.1-notes.xml                   |  427 -----
 docs/users_guide/7.8.1-notes.xml                   |   33 +
 docs/users_guide/bugs.xml                          |   22 +-
 docs/users_guide/ffi-chap.xml                      |   30 +-
 docs/users_guide/flags.xml                         |  102 +-
 docs/users_guide/ghci.xml                          |   84 +-
 docs/users_guide/glasgow_exts.xml                  | 1084 ++++++++----
 docs/users_guide/intro.xml                         |   71 +-
 docs/users_guide/packages.xml                      |    4 +-
 docs/users_guide/parallel.xml                      |    2 +-
 docs/users_guide/phases.xml                        |   15 +
 docs/users_guide/profiling.xml                     |   22 +-
 docs/users_guide/safe_haskell.xml                  |   56 +-
 docs/users_guide/sooner.xml                        |   11 +-
 docs/users_guide/ug-book.xml.in                    |    2 +-
 docs/users_guide/ug-ent.xml.in                     |    2 +-
 docs/users_guide/using.xml                         | 1811 +++++++++++---------
 driver/ghci/ghc.mk                                 |    1 +
 ghc.mk                                             |  234 ++-
 ghc/GhciMonad.hs                                   |   27 +-
 ghc/GhciTags.hs                                    |    8 +-
 ghc/InteractiveUI.hs                               |  179 +-
 ghc/Main.hs                                        |   66 +-
 ghc/ghc-bin.cabal.in                               |    4 +-
 ghc/ghc.mk                                         |   36 +-
 ghc/hschooks.c                                     |   10 +-
 includes/Cmm.h                                     |  325 +++-
 includes/CodeGen.Platform.hs                       |  923 ++++++++++
 includes/HaskellConstants.hs                       |  206 ---
 includes/HsFFI.h                                   |    4 +
 includes/Rts.h                                     |   12 +-
 includes/Stg.h                                     |    9 +-
 includes/ghc.mk                                    |  108 +-
 includes/mkDerivedConstants.cross.awk              |  350 ----
 includes/mkSizeMacros.cross.awk                    |   82 -
 includes/rts/Constants.h                           |   29 +-
 includes/rts/EventLogFormat.h                      |    6 +-
 includes/rts/Flags.h                               |    1 +
 includes/rts/{Timer.h => GetTime.h}                |   12 +-
 includes/rts/Globals.h                             |    2 +
 includes/rts/Hooks.h                               |    6 +-
 includes/rts/SpinLock.h                            |    2 +-
 includes/rts/Stable.h                              |   15 +-
 includes/rts/Threads.h                             |   12 +-
 includes/rts/Ticky.h                               |    2 +-
 includes/rts/Types.h                               |    6 +-
 includes/rts/Utils.h                               |    3 +
 includes/rts/prof/CCS.h                            |    9 +
 includes/rts/storage/Block.h                       |    6 +-
 includes/rts/storage/ClosureMacros.h               |  115 +-
 includes/rts/storage/ClosureTypes.h                |   24 +-
 includes/rts/storage/Closures.h                    |   58 +-
 includes/rts/storage/FunTypes.h                    |   35 +-
 includes/rts/storage/GC.h                          |   15 +-
 includes/rts/storage/Liveness.h                    |   34 -
 includes/rts/storage/MBlock.h                      |    6 +-
 includes/rts/storage/SMPClosureOps.h               |    2 +-
 includes/rts/storage/TSO.h                         |    3 +-
 includes/stg/HaskellMachRegs.h                     |   47 +
 includes/stg/MachRegs.h                            |  141 +-
 includes/stg/MiscClosures.h                        |   72 +-
 includes/stg/Regs.h                                |  415 +----
 includes/stg/RtsMachRegs.h                         |   53 +
 includes/stg/TailCalls.h                           |  185 --
 includes/stg/Types.h                               |   36 +-
 libraries/Cabal                                    |    1 +
 libraries/Win32                                    |    1 +
 .../Distribution/InstalledPackageInfo/Binary.hs    |    2 +-
 libraries/binary                                   |    1 +
 libraries/bytestring                               |    1 +
 libraries/containers                               |    1 +
 libraries/gen_contents_index                       |   24 +-
 libraries/haskeline                                |    1 +
 libraries/lwconc/GNUmakefile                       |    4 -
 libraries/lwconc/ghc.mk                            |    4 -
 libraries/pretty                                   |    1 +
 libraries/primitive                                |    1 +
 libraries/random                                   |    1 +
 libraries/tarballs/time-1.4.0.1.tar.gz             |  Bin 87466 -> 0 bytes
 libraries/terminfo                                 |    1 +
 libraries/time                                     |    1 +
 libraries/transformers                             |    1 +
 libraries/vector                                   |    1 +
 libraries/xhtml                                    |    1 +
 mk/build.mk.sample                                 |   50 +-
 mk/config.mk.in                                    |  139 +-
 mk/custom-settings.mk                              |    2 +-
 mk/validate-settings.mk                            |   45 +-
 mk/ways.mk                                         |   45 +-
 packages                                           |   31 +-
 rts/Apply.cmm                                      |   72 +-
 rts/Arena.c                                        |    2 +-
 rts/AutoApply.h                                    |    8 +-
 rts/Capability.c                                   |   12 +-
 rts/Capability.h                                   |    5 +-
 rts/ClosureFlags.c                                 |    6 +-
 rts/Disassembler.c                                 |    6 +-
 rts/Exception.cmm                                  |  301 ++--
 rts/FrontPanel.c                                   |    6 +-
 rts/FrontPanel.h                                   |    2 +-
 rts/GetTime.h                                      |    3 +-
 rts/Globals.c                                      |   14 +
 rts/Hash.c                                         |    5 +
 rts/Hash.h                                         |    3 +-
 rts/HeapStackCheck.cmm                             |  527 +++---
 rts/HsFFI.c                                        |   18 +
 rts/Interpreter.c                                  |   68 +-
 rts/LdvProfile.c                                   |    2 +-
 rts/Linker.c                                       |  800 +++++----
 rts/Messages.c                                     |   28 +-
 rts/Prelude.h                                      |    2 +
 rts/PrimOps.cmm                                    | 1454 +++++++---------
 rts/Printer.c                                      |   84 +-
 rts/ProfHeap.c                                     |    5 +-
 rts/Profiling.c                                    |   11 +-
 rts/Proftimer.c                                    |    8 +-
 rts/Proftimer.h                                    |    5 -
 rts/RetainerProfile.c                              |   45 +-
 rts/RetainerProfile.h                              |    2 +-
 rts/RtsAPI.c                                       |   12 +-
 rts/RtsFlags.c                                     |   17 +-
 rts/RtsProbes.d                                    |    1 +
 rts/RtsStartup.c                                   |    5 +-
 rts/RtsUtils.c                                     |    4 +-
 rts/RtsUtils.h                                     |    3 -
 rts/STM.c                                          |  155 +-
 rts/STM.h                                          |   10 +-
 rts/Schedule.c                                     |  322 ++--
 rts/Schedule.h                                     |   55 +-
 rts/Stable.c                                       |  624 +++----
 rts/Stable.h                                       |   29 +-
 rts/Stats.c                                        |  109 +-
 rts/Stats.h                                        |   14 +-
 rts/StgCRun.c                                      |    2 +-
 rts/StgMiscClosures.cmm                            |  157 +-
 rts/StgStartup.cmm                                 |   65 +-
 rts/StgStdThunks.cmm                               |  305 ++--
 rts/Task.c                                         |   31 +-
 rts/Task.h                                         |    8 +-
 rts/Threads.c                                      |  105 +-
 rts/Threads.h                                      |    2 +-
 rts/Timer.c                                        |   27 +-
 rts/Trace.c                                        |   97 +-
 rts/Trace.h                                        |   54 +-
 rts/Updates.cmm                                    |  109 +-
 rts/Updates.h                                      |   17 +-
 rts/eventlog/EventLog.c                            |   43 +-
 rts/eventlog/EventLog.h                            |   22 +-
 rts/ghc.mk                                         |   95 +-
 rts/hooks/MallocFail.c                             |    4 +-
 rts/hooks/OutOfHeap.c                              |    4 +-
 rts/hooks/StackOverflow.c                          |    4 +-
 rts/package.conf.in                                |    9 +-
 rts/parallel/Pack.c                                |    4 +-
 rts/parallel/ParTicky.c                            |    4 +-
 rts/posix/GetTime.c                                |    2 +-
 rts/posix/Itimer.c                                 |   21 +
 rts/posix/OSMem.c                                  |   18 +-
 rts/posix/OSThreads.c                              |    9 +-
 rts/posix/Select.c                                 |   32 +-
 rts/sm/BlockAlloc.c                                |   91 +-
 rts/sm/BlockAlloc.h                                |   12 +-
 rts/sm/Compact.c                                   |  196 +--
 rts/sm/Evac.c                                      |   50 +-
 rts/sm/Evac.h                                      |    2 +-
 rts/sm/GC.c                                        |  191 +--
 rts/sm/GC.h                                        |    8 +-
 rts/sm/GCAux.c                                     |   10 +-
 rts/sm/GCTDecl.h                                   |    2 +-
 rts/sm/GCThread.h                                  |   21 +-
 rts/sm/GCUtils.c                                   |    2 +-
 rts/sm/MBlock.c                                    |    6 +-
 rts/sm/MarkWeak.c                                  |   23 +-
 rts/sm/OSMem.h                                     |    4 +-
 rts/sm/Sanity.c                                    |  524 +++---
 rts/sm/Scav.c                                      |  293 ++--
 rts/sm/Storage.c                                   |  189 +-
 rts/sm/Storage.h                                   |   33 +-
 rts/sm/Sweep.c                                     |    2 +-
 rts/win32/AsyncIO.c                                |    6 +-
 rts/win32/AsyncIO.h                                |    2 +-
 rts/win32/GetTime.c                                |    2 +-
 rts/win32/IOManager.c                              |   42 +-
 rts/win32/IOManager.h                              |    4 +-
 rts/win32/OSMem.c                                  |   30 +-
 rts/win32/ThrIOManager.c                           |   10 +-
 rts/win32/libHSbase.def                            |    1 +
 ghc/Makefile => rules/add-dependency.mk            |    9 +-
 rules/build-dependencies.mk                        |    9 +-
 rules/build-package-data.mk                        |   35 +-
 rules/build-package-way.mk                         |   45 +-
 rules/build-package.mk                             |   25 +-
 rules/build-prog.mk                                |  125 +-
 rules/c-suffix-rules.mk                            |    3 +-
 rules/cmm-suffix-rules.mk                          |    4 -
 rules/distdir-opts.mk                              |  111 ++
 rules/distdir-way-opts.mk                          |  103 +-
 rules/haddock.mk                                   |   11 +-
 rules/hi-rule.mk                                   |   46 +-
 rules/hs-suffix-rules-srcdir.mk                    |   73 +-
 ...les-srcdir.mk => hs-suffix-way-rules-srcdir.mk} |   28 +-
 .../{hs-suffix-rules.mk => hs-suffix-way-rules.mk} |   14 +-
 rules/{trace.mk => library-path.mk}                |   16 +-
 rules/manual-package-config.mk                     |    2 +-
 rules/shell-wrapper.mk                             |   76 +-
 settings.in                                        |    6 +
 sync-all                                           |  249 ++-
 utils/Makefile                                     |  119 --
 utils/compare_sizes/ghc.mk                         |    1 +
 utils/deriveConstants/DeriveConstants.hs           |  875 ++++++++++
 utils/{genapply => deriveConstants}/Makefile       |    4 +-
 {driver => utils/deriveConstants}/ghc.mk           |   15 +-
 utils/genapply/GenApply.hs                         |  126 +-
 utils/genapply/ghc.mk                              |    1 +
 utils/genprimopcode/Lexer.x                        |    5 +
 utils/genprimopcode/Main.hs                        |  246 +--
 utils/genprimopcode/Parser.y                       |   13 +
 utils/genprimopcode/ParserM.hs                     |    5 +
 utils/genprimopcode/Syntax.hs                      |    9 +
 utils/genprimopcode/ghc.mk                         |    1 +
 utils/ghc-cabal/Main.hs                            |  155 +-
 utils/ghc-cabal/ghc-cabal.cabal                    |    3 +-
 utils/ghc-cabal/ghc.mk                             |    4 +-
 utils/ghc-pkg/Main.hs                              |   63 +-
 utils/ghc-pkg/ghc-pkg.cabal                        |    6 +-
 utils/ghc-pkg/ghc.mk                               |  128 +-
 utils/ghc-pwd/ghc-pwd.cabal                        |    2 +-
 utils/ghc-pwd/ghc.mk                               |    2 +
 utils/ghctags/Main.hs                              |    4 +-
 utils/ghctags/ghc.mk                               |    9 +-
 utils/ghctags/ghctags.cabal                        |   22 +
 utils/hp2ps/ghc.mk                                 |   15 +-
 utils/hpc/HpcCombine.hs                            |  116 +-
 utils/hpc/HpcDraft.hs                              |   31 +-
 utils/hpc/HpcFlags.hs                              |  140 +-
 utils/hpc/HpcLexer.hs                              |    6 +-
 utils/hpc/HpcMarkup.hs                             |    1 +
 utils/hpc/HpcOverlay.hs                            |   41 +-
 utils/hpc/HpcReport.hs                             |   41 +-
 utils/hpc/HpcShowTix.hs                            |   23 +-
 utils/hpc/Main.hs                                  |  114 +-
 utils/hpc/ghc.mk                                   |   11 +-
 utils/hpc/hpc-bin.cabal                            |   14 +-
 utils/lndir/Makefile                               |   17 -
 utils/mkUserGuidePart/ghc.mk                       |    9 +-
 .../mkUserGuidePart.cabal}                         |    8 +-
 utils/runghc/ghc.mk                                |    3 +-
 utils/runghc/runghc.cabal.in                       |    4 +-
 utils/runghc/runghc.hs                             |    2 +-
 utils/touchy/touchy.c                              |  138 +-
 utils/unlit/ghc.mk                                 |    1 +
 validate                                           |   30 +-
 690 files changed, 54609 insertions(+), 56127 deletions(-)


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

    git show 41c44e4db3105d8f4bc78ffcd4fc30764ab788d8



More information about the ghc-commits mailing list