Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : new-demand-to-merge
http://hackage.haskell.org/trac/ghc/changeset/17b0c213a1997192687ca82480f9d57888a1fc68 >--------------------------------------------------------------- commit 17b0c213a1997192687ca82480f9d57888a1fc68 Merge: 9bb7505... 71feb10... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Thu Jan 3 13:37:21 2013 +0000 Merge branch 'master' into new-demand-to-merge Conflicts: compiler/basicTypes/Id.lhs compiler/basicTypes/MkId.lhs compiler/prelude/primops.txt.pp compiler/specialise/SpecConstr.lhs compiler/stranal/DmdAnal.lhs .gitignore | 13 - .gitmodules | 39 + aclocal.m4 | 176 +--- boot | 43 - compiler/basicTypes/BasicTypes.lhs | 58 -- compiler/basicTypes/DataCon.lhs | 342 ++++--- compiler/basicTypes/DataCon.lhs-boot | 1 + compiler/basicTypes/Id.lhs | 163 ++-- compiler/basicTypes/Literal.lhs | 7 +- compiler/basicTypes/MkId.lhs | 724 ++++++++------ compiler/basicTypes/MkId.lhs-boot | 10 +- compiler/basicTypes/Module.lhs | 8 + compiler/basicTypes/Name.lhs | 227 +++--- compiler/cmm/Cmm.hs | 51 +- compiler/cmm/CmmBuildInfoTables.hs | 8 +- compiler/cmm/CmmCallConv.hs | 61 +- compiler/cmm/CmmContFlowOpt.hs | 47 +- compiler/cmm/CmmCvt.hs | 117 --- compiler/cmm/CmmExpr.hs | 141 ++- compiler/cmm/CmmInfo.hs | 41 +- compiler/cmm/CmmLayoutStack.hs | 16 +- compiler/cmm/CmmLint.hs | 23 +- compiler/cmm/CmmLive.hs | 78 +- compiler/cmm/CmmMachOp.hs | 2 + compiler/cmm/CmmNode.hs | 74 ++- compiler/cmm/CmmOpt.hs | 12 +- compiler/cmm/CmmParse.y | 13 +- compiler/cmm/CmmPipeline.hs | 74 +- compiler/cmm/CmmProcPoint.hs | 32 +- compiler/cmm/CmmRewriteAssignments.hs | 62 +- compiler/cmm/CmmSink.hs | 30 +- compiler/cmm/CmmUtils.hs | 14 +- compiler/cmm/MkGraph.hs | 52 +- compiler/cmm/OldCmm.hs | 277 ------ compiler/cmm/OldCmmLint.hs | 212 ---- compiler/cmm/OldCmmUtils.hs | 100 -- compiler/cmm/OldPprCmm.hs | 224 ----- compiler/cmm/PprC.hs | 141 ++-- compiler/cmm/PprCmmDecl.hs | 4 +- compiler/cmm/PprCmmExpr.hs | 1 - compiler/cmm/SMRep.lhs | 11 +- compiler/codeGen/CgUtils.hs | 97 +-- compiler/codeGen/StgCmm.hs | 13 +- compiler/codeGen/StgCmmBind.hs | 61 +- compiler/codeGen/StgCmmClosure.hs | 8 + compiler/codeGen/StgCmmExpr.hs | 6 +- compiler/codeGen/StgCmmForeign.hs | 10 +- compiler/codeGen/StgCmmHeap.hs | 20 +- compiler/codeGen/StgCmmLayout.hs | 6 +- compiler/codeGen/StgCmmMonad.hs | 20 +- compiler/codeGen/StgCmmPrim.hs | 158 ++-- compiler/codeGen/StgCmmUtils.hs | 3 +- compiler/coreSyn/CoreLint.lhs | 118 ++- compiler/coreSyn/CoreSubst.lhs | 7 +- compiler/coreSyn/CoreSyn.lhs | 22 +- compiler/coreSyn/CoreUnfold.lhs | 7 +- compiler/coreSyn/CoreUtils.lhs | 111 ++- compiler/coreSyn/ExternalCore.lhs | 1 + compiler/coreSyn/MkCore.lhs | 4 +- compiler/coreSyn/MkExternalCore.lhs | 8 +- compiler/coreSyn/PprExternalCore.lhs | 53 +- compiler/coreSyn/TrieMap.lhs | 60 +- compiler/deSugar/Check.lhs | 2 +- compiler/deSugar/DsArrows.lhs | 76 +- compiler/deSugar/DsBinds.lhs | 8 +- compiler/deSugar/DsExpr.lhs | 3 +- compiler/deSugar/DsForeign.lhs | 11 +- compiler/deSugar/DsGRHSs.lhs | 3 +- compiler/deSugar/DsListComp.lhs | 5 +- compiler/deSugar/DsMeta.hs | 167 +++-- compiler/deSugar/DsMonad.lhs | 7 +- compiler/deSugar/DsUtils.lhs | 15 +- compiler/deSugar/MatchLit.lhs | 6 +- compiler/ghc.cabal.in | 21 +- compiler/ghc.mk | 36 +- compiler/ghci/ByteCodeAsm.lhs | 14 +- compiler/ghci/ByteCodeGen.lhs | 12 +- compiler/ghci/ByteCodeLink.lhs | 2 +- compiler/ghci/LibFFI.hsc | 34 +- compiler/ghci/Linker.lhs | 26 +- compiler/ghci/RtClosureInspect.hs | 39 +- compiler/ghci/keepCAFsForGHCi.c | 5 +- compiler/hsSyn/Convert.lhs | 460 +++++----- compiler/hsSyn/HsDecls.lhs | 498 ++++++---- compiler/hsSyn/HsLit.lhs | 3 +- compiler/hsSyn/HsTypes.lhs | 1 + compiler/hsSyn/HsUtils.lhs | 31 +- compiler/iface/BinIface.hs | 50 +- compiler/iface/BuildTyCl.lhs | 18 +- compiler/iface/IfaceSyn.lhs | 69 +- compiler/iface/IfaceType.lhs | 85 +- compiler/iface/LoadIface.lhs | 218 +++-- compiler/iface/MkIface.lhs | 78 +- compiler/iface/TcIface.lhs | 77 +- compiler/iface/TcIface.lhs-boot | 4 +- compiler/llvmGen/LlvmCodeGen.hs | 19 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 40 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 272 +++--- compiler/llvmGen/LlvmCodeGen/Data.hs | 2 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 6 +- compiler/llvmGen/LlvmCodeGen/Regs.hs | 6 + compiler/main/CodeOutput.lhs | 21 +- compiler/main/DriverMkDepend.hs | 46 +- compiler/main/DriverPipeline.hs | 179 ++-- compiler/main/DynFlags.hs | 248 ++++-- compiler/main/DynamicLoading.hs | 7 +- compiler/main/ErrUtils.lhs | 5 +- compiler/main/GHC.hs | 37 +- compiler/main/GhcMake.hs | 19 +- compiler/main/HscMain.hs | 33 +- compiler/main/HscStats.hs | 19 +- compiler/main/HscStats.lhs | 6 +- compiler/main/HscTypes.lhs | 29 +- compiler/main/InteractiveEval.hs | 73 +- compiler/main/Packages.lhs | 12 +- compiler/main/PprTyThing.hs | 23 +- compiler/main/StaticFlagParser.hs | 6 +- compiler/main/StaticFlags.hs | 2 +- compiler/main/SysTools.lhs | 8 +- compiler/main/TidyPgm.lhs | 221 +++--- compiler/nativeGen/AsmCodeGen.lhs | 390 ++++---- compiler/nativeGen/CPrim.hs | 12 +- compiler/nativeGen/Instruction.hs | 13 +- compiler/nativeGen/NCGMonad.hs | 105 +-- compiler/nativeGen/PIC.hs | 18 +- compiler/nativeGen/PPC/CodeGen.hs | 76 +- compiler/nativeGen/PPC/Instr.hs | 577 ++++++------ compiler/nativeGen/PPC/Ppr.hs | 4 +- compiler/nativeGen/PPC/RegInfo.hs | 9 +- compiler/nativeGen/PPC/Regs.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 | 236 +++-- compiler/nativeGen/RegAlloc/Graph/Spill.hs | 195 +++-- compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 802 ++++++++-------- compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 363 ++++---- compiler/nativeGen/RegAlloc/Graph/Stats.hs | 128 ++- compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 12 + compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 22 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 1 - compiler/nativeGen/RegAlloc/Linear/Main.hs | 28 +- compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs | 15 +- .../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs | 233 +++--- compiler/nativeGen/RegAlloc/Linear/StackMap.hs | 37 +- compiler/nativeGen/RegAlloc/Linear/Stats.hs | 111 +-- compiler/nativeGen/RegAlloc/Liveness.hs | 55 +- compiler/nativeGen/SPARC/CodeGen.hs | 77 +- compiler/nativeGen/SPARC/CodeGen/Amode.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Base.hs | 3 +- compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Expand.hs | 6 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 2 +- 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 | 2 +- compiler/nativeGen/SPARC/Instr.hs | 2 +- compiler/nativeGen/SPARC/Ppr.hs | 6 +- compiler/nativeGen/SPARC/ShortcutJump.hs | 2 +- compiler/nativeGen/Size.hs | 2 +- compiler/nativeGen/TargetReg.hs | 15 + compiler/nativeGen/X86/CodeGen.hs | 240 +++--- compiler/nativeGen/X86/Instr.hs | 8 +- compiler/nativeGen/X86/Ppr.hs | 4 +- compiler/nativeGen/X86/Regs.hs | 2 +- compiler/parser/Lexer.x | 7 +- compiler/parser/Parser.y.pp | 97 ++- compiler/parser/ParserCore.y | 22 +- compiler/parser/RdrHsSyn.lhs | 116 ++- compiler/prelude/PrelNames.lhs | 12 +- compiler/prelude/PrelRules.lhs | 3 +- compiler/prelude/PrimOp.lhs | 15 +- compiler/prelude/TysPrim.lhs | 9 +- compiler/prelude/TysWiredIn.lhs | 39 +- compiler/prelude/TysWiredIn.lhs-boot | 1 + compiler/prelude/primops.txt.pp | 67 +- compiler/rename/RnBinds.lhs | 1 + compiler/rename/RnEnv.lhs | 2 +- compiler/rename/RnExpr.lhs | 3 +- compiler/rename/RnNames.lhs | 67 +- compiler/rename/RnPat.lhs | 20 +- compiler/rename/RnSource.lhs | 254 +++-- compiler/rename/RnTypes.lhs | 25 +- compiler/simplCore/CoreMonad.lhs | 11 +- compiler/simplCore/OccurAnal.lhs | 252 +---- compiler/simplCore/SimplMonad.lhs | 10 +- compiler/simplCore/SimplUtils.lhs | 127 ++-- compiler/simplCore/Simplify.lhs | 106 ++- compiler/specialise/SpecConstr.lhs | 1016 ++++++++++---------- compiler/stranal/DmdAnal.lhs | 1 - compiler/stranal/WwLib.lhs | 65 ++- compiler/typecheck/FamInst.lhs | 134 ++- compiler/typecheck/Inst.lhs | 112 +-- compiler/typecheck/TcBinds.lhs | 3 +- compiler/typecheck/TcCanonical.lhs | 31 +- compiler/typecheck/TcClassDcl.lhs | 11 +- compiler/typecheck/TcDeriv.lhs | 73 +- compiler/typecheck/TcEnv.lhs | 56 +- compiler/typecheck/TcErrors.lhs | 61 +- compiler/typecheck/TcEvidence.lhs | 63 +- compiler/typecheck/TcExpr.lhs | 21 +- compiler/typecheck/TcForeign.lhs | 176 ++-- compiler/typecheck/TcGenDeriv.lhs | 50 +- compiler/typecheck/TcGenGenerics.lhs | 48 +- compiler/typecheck/TcHsSyn.lhs | 3 +- compiler/typecheck/TcHsType.lhs | 65 +- compiler/typecheck/TcInstDcls.lhs | 226 +++-- compiler/typecheck/TcInteract.lhs | 114 ++- compiler/typecheck/TcMType.lhs | 81 +- compiler/typecheck/TcPat.lhs | 2 +- compiler/typecheck/TcRnDriver.lhs | 50 +- compiler/typecheck/TcRnMonad.lhs | 12 +- compiler/typecheck/TcRnTypes.lhs | 633 +++++++------ compiler/typecheck/TcSMonad.lhs | 72 +- compiler/typecheck/TcSimplify.lhs | 27 +- compiler/typecheck/TcSplice.lhs | 65 +- compiler/typecheck/TcTyClsDecls.lhs | 573 ++++++------ compiler/typecheck/TcTyDecls.lhs | 2 +- compiler/typecheck/TcType.lhs | 171 +++-- compiler/typecheck/TcUnify.lhs | 154 ++- compiler/types/Class.lhs | 2 +- compiler/types/CoAxiom.lhs | 292 ++++++ compiler/types/Coercion.lhs | 132 ++-- compiler/types/FamInstEnv.lhs | 839 ++++++++++++----- compiler/types/FunDeps.lhs | 12 +- compiler/types/InstEnv.lhs | 136 ++-- compiler/types/Kind.lhs | 67 +- compiler/types/OptCoercion.lhs | 52 +- compiler/types/TyCon.lhs | 164 ++-- compiler/types/Type.lhs | 45 +- compiler/types/TypeRep.lhs | 6 +- compiler/types/Unify.lhs | 168 +++-- compiler/utils/Binary.hs | 36 +- compiler/utils/BufWrite.hs | 31 +- compiler/utils/FastString.lhs | 240 ++--- compiler/utils/IOEnv.hs | 5 + compiler/utils/ListSetOps.lhs | 18 + compiler/utils/Maybes.lhs | 9 - compiler/utils/MonadUtils.hs | 32 +- compiler/utils/Outputable.lhs | 14 +- compiler/utils/Panic.lhs | 6 +- compiler/utils/Platform.hs | 3 + compiler/utils/UniqFM.lhs | 2 +- compiler/vectorise/Vectorise.hs | 3 +- compiler/vectorise/Vectorise/Env.hs | 2 +- compiler/vectorise/Vectorise/Generic/PADict.hs | 8 +- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 20 +- compiler/vectorise/Vectorise/Generic/PData.hs | 15 +- compiler/vectorise/Vectorise/Monad/InstEnv.hs | 4 +- compiler/vectorise/Vectorise/Monad/Naming.hs | 5 +- compiler/vectorise/Vectorise/Type/Env.hs | 15 +- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 4 +- compiler/vectorise/Vectorise/Utils/Base.hs | 16 +- compiler/vectorise/Vectorise/Utils/PADict.hs | 11 +- configure.ac | 99 ++- distrib/configure.ac.in | 1 - 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/users_guide/bugs.xml | 22 +- docs/users_guide/ffi-chap.xml | 28 +- docs/users_guide/flags.xml | 34 +- docs/users_guide/ghci.xml | 24 +- docs/users_guide/glasgow_exts.xml | 612 ++++++------ docs/users_guide/profiling.xml | 22 +- docs/users_guide/safe_haskell.xml | 52 + docs/users_guide/sooner.xml | 11 +- docs/users_guide/using.xml | 66 ++ ghc.mk | 40 +- ghc/GhciMonad.hs | 22 +- ghc/GhciTags.hs | 8 +- ghc/InteractiveUI.hs | 70 +- ghc/Main.hs | 20 +- ghc/ghc-bin.cabal.in | 2 +- ghc/ghc.mk | 2 +- includes/Cmm.h | 34 +- includes/CodeGen.Platform.hs | 161 +++ includes/Rts.h | 6 + includes/Stg.h | 7 +- includes/ghc.mk | 83 +-- includes/mkDerivedConstants.c | 806 ---------------- includes/mkDerivedConstants.cross.awk | 350 ------- includes/mkSizeMacros.cross.awk | 82 -- includes/rts/Constants.h | 5 +- includes/rts/Threads.h | 3 + includes/rts/storage/Block.h | 2 +- includes/rts/storage/ClosureMacros.h | 4 +- includes/rts/storage/ClosureTypes.h | 37 +- includes/rts/storage/Closures.h | 2 - includes/stg/MachRegs.h | 62 ++- includes/stg/MiscClosures.h | 3 +- includes/stg/Regs.h | 42 + includes/stg/TailCalls.h | 185 ---- libraries/Cabal | 1 + libraries/Win32 | 1 + libraries/binary | 1 + libraries/bytestring | 1 + libraries/containers | 1 + libraries/haskeline | 1 + libraries/pretty | 1 + libraries/primitive | 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/config.mk.in | 45 +- mk/validate-settings.mk | 16 +- packages | 24 +- rts/AutoApply.h | 4 +- rts/Capability.h | 3 +- rts/ClosureFlags.c | 5 +- rts/Exception.cmm | 19 +- rts/HeapStackCheck.cmm | 19 +- rts/LdvProfile.c | 1 + rts/Linker.c | 8 +- rts/PrimOps.cmm | 21 +- rts/Printer.c | 14 + rts/ProfHeap.c | 3 +- rts/RetainerProfile.c | 10 +- rts/STM.c | 138 ++-- rts/STM.h | 10 +- rts/Schedule.c | 2 +- rts/StgCRun.c | 2 +- rts/StgMiscClosures.cmm | 9 +- rts/StgStartup.cmm | 9 +- rts/Updates.cmm | 18 +- rts/ghc.mk | 55 +- rts/package.conf.in | 3 + rts/posix/OSThreads.c | 3 +- rts/sm/Compact.c | 1 + rts/sm/Evac.c | 12 +- rts/sm/GC.c | 30 +- rts/sm/GC.h | 8 +- rts/sm/Sanity.c | 14 +- rts/sm/Scav.c | 73 ++- rts/sm/Storage.c | 9 + rts/sm/Storage.h | 3 +- rules/build-dependencies.mk | 12 +- rules/build-package-way.mk | 15 +- rules/build-prog.mk | 25 +- rules/distdir-way-opts.mk | 12 + sync-all | 153 +++- utils/deriveConstants/DeriveConstants.hs | 866 +++++++++++++++++ {driver/split => utils/deriveConstants}/Makefile | 4 +- {driver/split => utils/deriveConstants}/ghc.mk | 12 +- utils/genapply/GenApply.hs | 54 +- utils/genprimopcode/Lexer.x | 5 + utils/genprimopcode/Main.hs | 29 +- utils/genprimopcode/Parser.y | 13 + utils/genprimopcode/ParserM.hs | 5 + utils/genprimopcode/Syntax.hs | 9 + utils/ghc-pkg/Main.hs | 13 +- utils/ghc-pkg/ghc-pkg.cabal | 2 +- 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/hpc-bin.cabal | 1 + utils/runghc/runghc.cabal.in | 2 +- utils/touchy/touchy.c | 138 ++- validate | 9 +- 373 files changed, 14933 insertions(+), 11829 deletions(-) Diff suppressed because of size. To see it, use: git show 17b0c213a1997192687ca82480f9d57888a1fc68 _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
