Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-holes-branch
http://hackage.haskell.org/trac/ghc/changeset/3c61dcd714d0612e61ab56dab280adeaa2ae973b >--------------------------------------------------------------- commit 3c61dcd714d0612e61ab56dab280adeaa2ae973b Merge: fe99d51... a211fcf... Author: Thijs Alkemade <[email protected]> Date: Tue Jul 17 13:55:41 2012 +0200 Merge branch 'master' of https://github.com/ghc/ghc .gitignore | 1 + aclocal.m4 | 90 +-- bindisttest/Makefile | 4 +- bindisttest/ghc.mk | 4 +- compiler/HsVersions.h | 13 +- compiler/basicTypes/BasicTypes.lhs | 44 +- compiler/basicTypes/DataCon.lhs | 16 +- compiler/basicTypes/Demand.lhs | 3 - compiler/basicTypes/Id.lhs | 21 +- compiler/basicTypes/IdInfo.lhs | 17 +- compiler/basicTypes/Literal.lhs | 56 +- compiler/basicTypes/MkId.lhs | 37 +- compiler/basicTypes/MkId.lhs-boot | 3 + compiler/basicTypes/OccName.lhs | 5 +- compiler/basicTypes/RdrName.lhs | 6 - compiler/basicTypes/SrcLoc.lhs | 252 +++--- compiler/basicTypes/UniqSupply.lhs | 44 +- compiler/basicTypes/Unique.lhs | 37 +- compiler/basicTypes/Var.lhs | 3 - compiler/cmm/Bitmap.hs | 2 +- compiler/cmm/BlockId.hs | 10 +- compiler/cmm/CLabel.hs | 117 ++-- compiler/cmm/Cmm.hs | 18 +- compiler/cmm/CmmBuildInfoTables.hs | 446 +++------ compiler/cmm/CmmCallConv.hs | 27 +- compiler/cmm/CmmCommonBlockElim.hs | 143 ++-- compiler/cmm/CmmContFlowOpt.hs | 295 +++--- compiler/cmm/CmmCvt.hs | 24 +- compiler/cmm/CmmExpr.hs | 126 +-- compiler/cmm/CmmInfo.hs | 21 +- compiler/cmm/CmmLayoutStack.hs | 981 ++++++++++++++++++++ compiler/cmm/CmmLint.hs | 251 +++--- compiler/cmm/CmmLive.hs | 57 +- compiler/cmm/CmmMachOp.hs | 1 + compiler/cmm/CmmNode.hs | 107 +-- compiler/cmm/CmmOpt.hs | 145 ++-- compiler/cmm/CmmParse.y | 46 +- compiler/cmm/CmmPipeline.hs | 247 ++--- compiler/cmm/CmmProcPoint.hs | 350 ++----- compiler/cmm/CmmRewriteAssignments.hs | 34 +- compiler/cmm/CmmSink.hs | 256 +++++ compiler/cmm/CmmSpillReload.hs | 166 ---- compiler/cmm/CmmStackLayout.hs | 591 ------------ compiler/cmm/CmmUtils.hs | 133 ++-- compiler/cmm/Hoopl.hs | 129 +++ compiler/cmm/Hoopl/Dataflow.hs | 890 ++++++++++++++++++ compiler/cmm/MkGraph.hs | 553 +++++------ compiler/cmm/OldCmm.hs | 33 +- compiler/cmm/{CmmLint.hs => OldCmmLint.hs} | 62 +- compiler/cmm/OldPprCmm.hs | 116 +-- compiler/cmm/OptimizationFuel.hs | 141 --- compiler/cmm/PprC.hs | 54 +- compiler/cmm/PprCmm.hs | 128 ++-- compiler/cmm/PprCmmDecl.hs | 95 +-- compiler/cmm/PprCmmExpr.hs | 115 +-- compiler/cmm/SMRep.lhs | 6 + compiler/cmm/cmm-notes | 369 -------- compiler/codeGen/CgBindery.lhs | 27 +- compiler/codeGen/CgCase.lhs | 1 - compiler/codeGen/CgClosure.lhs | 27 +- compiler/codeGen/CgCon.lhs | 11 +- compiler/codeGen/CgExpr.lhs | 2 +- compiler/codeGen/CgForeignCall.hs | 4 +- compiler/codeGen/CgInfoTbls.hs | 35 +- compiler/codeGen/CgMonad.lhs | 18 +- compiler/codeGen/CgParallel.hs | 59 +- compiler/codeGen/CgPrimOp.hs | 69 ++- compiler/codeGen/CgProf.hs | 3 +- compiler/codeGen/CgStackery.lhs | 3 +- compiler/codeGen/CgTailCall.lhs | 1 + compiler/codeGen/CgTicky.hs | 13 +- compiler/codeGen/CgUtils.hs | 10 +- compiler/codeGen/ClosureInfo.lhs | 42 +- compiler/codeGen/CodeGen.lhs | 59 +- compiler/codeGen/StgCmm.hs | 144 ++-- compiler/codeGen/StgCmmBind.hs | 98 +- compiler/codeGen/StgCmmClosure.hs | 88 +- compiler/codeGen/StgCmmCon.hs | 4 +- compiler/codeGen/StgCmmEnv.hs | 4 +- compiler/codeGen/StgCmmExpr.hs | 292 ++++-- compiler/codeGen/StgCmmForeign.hs | 137 +++- compiler/codeGen/StgCmmGran.hs | 41 +- compiler/codeGen/StgCmmHeap.hs | 101 ++- compiler/codeGen/StgCmmLayout.hs | 262 ++++-- compiler/codeGen/StgCmmMonad.hs | 127 +++- compiler/codeGen/StgCmmPrim.hs | 247 +++++- compiler/codeGen/StgCmmProf.hs | 11 +- compiler/codeGen/StgCmmTicky.hs | 23 +- compiler/codeGen/StgCmmUtils.hs | 257 +++--- compiler/coreSyn/CoreArity.lhs | 10 +- compiler/coreSyn/CoreFVs.lhs | 4 +- compiler/coreSyn/CoreLint.lhs | 26 +- compiler/coreSyn/CorePrep.lhs | 385 ++++---- compiler/coreSyn/CoreSubst.lhs | 5 +- compiler/coreSyn/CoreSyn.lhs | 88 ++- compiler/coreSyn/CoreTidy.lhs | 4 +- compiler/coreSyn/CoreUnfold.lhs | 242 ++--- compiler/coreSyn/CoreUtils.lhs | 181 +++-- compiler/coreSyn/MkCore.lhs | 64 +- compiler/coreSyn/MkExternalCore.lhs | 196 +++-- compiler/coreSyn/PprCore.lhs | 209 ++--- compiler/coreSyn/TrieMap.lhs | 60 +- compiler/deSugar/Coverage.lhs | 413 +++++---- compiler/deSugar/DsArrows.lhs | 4 +- compiler/deSugar/DsBinds.lhs | 112 ++- compiler/deSugar/DsCCall.lhs | 11 +- compiler/deSugar/DsExpr.lhs | 77 +- compiler/deSugar/DsForeign.lhs | 55 +- compiler/deSugar/DsGRHSs.lhs | 10 +- compiler/deSugar/DsListComp.lhs | 50 +- compiler/deSugar/DsMeta.hs | 482 +++++++--- compiler/deSugar/DsMonad.lhs | 14 +- compiler/deSugar/DsUtils.lhs | 4 +- compiler/deSugar/Match.lhs | 1 + compiler/deSugar/MatchCon.lhs | 2 +- compiler/ghc.cabal.in | 11 +- compiler/ghc.mk | 20 +- compiler/ghci/ByteCodeAsm.lhs | 1 + compiler/ghci/ByteCodeGen.lhs | 166 ++-- compiler/ghci/ByteCodeItbls.lhs | 3 +- compiler/ghci/ByteCodeLink.lhs | 1 + compiler/ghci/Debugger.hs | 11 +- compiler/ghci/DebuggerUtils.hs | 4 +- compiler/ghci/LibFFI.hsc | 4 +- compiler/ghci/Linker.lhs | 66 +- compiler/ghci/RtClosureInspect.hs | 178 +++-- compiler/hsSyn/Convert.lhs | 100 ++- compiler/hsSyn/HsBinds.lhs | 36 +- compiler/hsSyn/HsDecls.lhs | 45 +- compiler/hsSyn/HsExpr.lhs | 53 +- compiler/hsSyn/HsPat.lhs | 4 +- compiler/hsSyn/HsTypes.lhs | 178 +++-- compiler/hsSyn/HsUtils.lhs | 17 +- compiler/iface/BinIface.hs | 48 +- compiler/iface/BuildTyCl.lhs | 2 +- compiler/iface/IfaceEnv.lhs | 26 +- compiler/iface/IfaceSyn.lhs | 24 +- compiler/iface/IfaceType.lhs | 21 +- compiler/iface/LoadIface.lhs | 13 +- compiler/iface/MkIface.lhs | 181 +++-- compiler/iface/TcIface.lhs | 107 ++- compiler/llvmGen/Llvm.hs | 1 - compiler/llvmGen/Llvm/PpLlvm.hs | 106 +-- compiler/llvmGen/LlvmCodeGen.hs | 41 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 16 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 40 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 13 +- compiler/main/CmdLineParser.hs | 4 +- compiler/main/CodeOutput.lhs | 67 +- compiler/main/Constants.lhs | 4 + compiler/main/DriverMkDepend.hs | 10 +- compiler/main/DriverPipeline.hs | 34 +- compiler/main/DynFlags.hs | 312 +++++-- compiler/main/DynFlags.hs-boot | 13 + compiler/main/DynamicLoading.hs | 21 +- compiler/main/ErrUtils.lhs | 108 ++- compiler/main/ErrUtils.lhs-boot | 1 + compiler/main/GHC.hs | 72 +- compiler/main/GhcMake.hs | 79 +- compiler/main/HeaderInfo.hs | 52 +- compiler/main/HscMain.hs | 169 +++-- compiler/main/HscTypes.lhs | 88 +- compiler/main/InteractiveEval.hs | 69 +- compiler/main/Packages.lhs | 136 ++-- compiler/main/StaticFlagParser.hs | 38 +- compiler/main/StaticFlags.hs | 57 +- compiler/main/SysTools.lhs | 22 +- compiler/main/TidyPgm.lhs | 561 ++++++------ compiler/nativeGen/AsmCodeGen.lhs | 137 ++- compiler/nativeGen/PIC.hs | 93 +-- compiler/nativeGen/PPC/CodeGen.hs | 24 +- compiler/nativeGen/PPC/Ppr.hs | 100 +- compiler/nativeGen/PPC/Regs.hs | 14 +- compiler/nativeGen/PprBase.hs | 17 - compiler/nativeGen/RegAlloc/Graph/Main.hs | 579 ++++++------ compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 10 +- compiler/nativeGen/RegAlloc/Graph/Stats.hs | 30 +- compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 56 +- compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 14 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 73 +- compiler/nativeGen/RegAlloc/Liveness.hs | 68 +- compiler/nativeGen/SPARC/CodeGen.hs | 25 +- compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 7 +- compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 3 +- compiler/nativeGen/SPARC/CodeGen/Sanity.hs | 10 +- compiler/nativeGen/SPARC/Imm.hs | 5 +- compiler/nativeGen/SPARC/Ppr.hs | 94 +- compiler/nativeGen/TargetReg.hs | 70 +- compiler/nativeGen/X86/CodeGen.hs | 152 ++-- compiler/nativeGen/X86/Instr.hs | 14 +- compiler/nativeGen/X86/Ppr.hs | 160 ++-- compiler/nativeGen/X86/Regs.hs | 114 ++-- compiler/parser/Lexer.x | 117 ++- compiler/parser/Parser.y.pp | 31 +- compiler/parser/ParserCore.y | 12 +- compiler/parser/RdrHsSyn.lhs | 27 +- compiler/prelude/PrelNames.lhs | 76 ++- compiler/prelude/PrelRules.lhs | 217 ++++- compiler/prelude/PrimOp.lhs | 3 - compiler/prelude/PrimOp.lhs-boot | 7 + compiler/prelude/TysPrim.lhs | 31 +- compiler/prelude/TysWiredIn.lhs | 48 +- compiler/prelude/primops.txt.pp | 22 + compiler/profiling/CostCentre.lhs | 6 +- compiler/profiling/ProfInit.hs | 9 +- compiler/profiling/SCCfinal.lhs | 1 + compiler/rename/RnBinds.lhs | 25 +- compiler/rename/RnEnv.lhs | 327 +++++-- compiler/rename/RnExpr.lhs | 81 +- compiler/rename/RnNames.lhs | 101 +-- compiler/rename/RnPat.lhs | 16 +- compiler/rename/RnSource.lhs | 145 ++-- compiler/rename/RnTypes.lhs | 279 ++++--- compiler/simplCore/CSE.lhs | 30 +- compiler/simplCore/CoreMonad.lhs | 52 +- compiler/simplCore/FloatIn.lhs | 18 +- compiler/simplCore/OccurAnal.lhs | 4 +- compiler/simplCore/SimplCore.lhs | 110 +-- compiler/simplCore/SimplEnv.lhs | 1 + compiler/simplCore/SimplMonad.lhs | 52 +- compiler/simplCore/SimplUtils.lhs | 132 ++-- compiler/simplCore/Simplify.lhs | 139 ++-- compiler/simplStg/SRT.lhs | 4 +- compiler/simplStg/SimplStg.lhs | 14 +- compiler/simplStg/UnariseStg.lhs | 167 ++++ compiler/specialise/Rules.lhs | 470 +++++----- compiler/specialise/SpecConstr.lhs | 13 +- compiler/specialise/Specialise.lhs | 913 ++++++++++--------- compiler/stgSyn/CoreToStg.lhs | 39 +- compiler/stgSyn/StgLint.lhs | 38 +- compiler/stgSyn/StgSyn.lhs | 48 +- compiler/stranal/DmdAnal.lhs | 4 +- compiler/stranal/WorkWrap.lhs | 88 +- compiler/stranal/WwLib.lhs | 33 +- compiler/typecheck/FamInst.lhs | 35 +- compiler/typecheck/Inst.lhs | 111 ++-- compiler/typecheck/TcBinds.lhs | 99 ++- compiler/typecheck/TcCanonical.lhs | 429 ++++----- compiler/typecheck/TcClassDcl.lhs | 50 +- compiler/typecheck/TcDeriv.lhs | 197 +++-- compiler/typecheck/TcEnv.lhs | 20 +- compiler/typecheck/TcErrors.lhs | 120 ++-- compiler/typecheck/TcEvidence.lhs | 99 ++- compiler/typecheck/TcExpr.lhs | 42 +- compiler/typecheck/TcForeign.lhs | 18 +- compiler/typecheck/TcGenDeriv.lhs | 8 +- compiler/typecheck/TcGenGenerics.lhs | 507 ++++++++--- compiler/typecheck/TcHsSyn.lhs | 168 ++-- compiler/typecheck/TcHsType.lhs | 290 ++++--- compiler/typecheck/TcInstDcls.lhs | 273 +++--- compiler/typecheck/TcInteract.lhs | 673 +++++++------- compiler/typecheck/TcMType.lhs | 639 +++++++------- compiler/typecheck/TcMatches.lhs | 78 +-- compiler/typecheck/TcPat.lhs | 66 +-- compiler/typecheck/TcRnDriver.lhs | 208 +++-- compiler/typecheck/TcRnMonad.lhs | 39 +- compiler/typecheck/TcRnTypes.lhs | 260 +++--- compiler/typecheck/TcRules.lhs | 3 +- compiler/typecheck/TcSMonad.lhs | 857 ++++++++++-------- compiler/typecheck/TcSimplify.lhs | 883 +++++++++++------- compiler/typecheck/TcSplice.lhs | 87 ++- compiler/typecheck/TcTyClsDecls.lhs | 501 ++++++----- compiler/typecheck/TcType.lhs | 36 +- compiler/typecheck/TcUnify.lhs | 84 +- compiler/types/Class.lhs | 28 +- compiler/types/Coercion.lhs | 17 +- compiler/types/FunDeps.lhs | 91 ++- compiler/types/IParam.lhs | 41 - compiler/types/IParam.lhs-boot | 10 - compiler/types/InstEnv.lhs | 49 +- compiler/types/Kind.lhs | 53 +- compiler/types/OptCoercion.lhs | 1 + compiler/types/TyCon.lhs | 39 +- compiler/types/Type.lhs | 151 ++-- compiler/types/TypeRep.lhs | 54 +- compiler/types/Unify.lhs | 50 +- compiler/utils/Binary.hs | 3 - compiler/utils/Digraph.lhs | 11 +- compiler/utils/Exception.hs | 6 +- compiler/utils/FastString.lhs | 5 - compiler/utils/ListSetOps.lhs | 73 +-- compiler/utils/MonadUtils.hs | 18 - compiler/utils/OrdList.lhs | 47 +- compiler/utils/Outputable.lhs | 210 ++--- compiler/utils/Outputable.lhs-boot | 7 + compiler/utils/Panic.lhs | 136 ++-- compiler/utils/Platform.hs | 12 +- compiler/utils/Pretty.lhs | 9 +- compiler/utils/Stream.hs | 97 ++ compiler/utils/Util.lhs | 195 ++--- compiler/vectorise/Vectorise.hs | 21 +- compiler/vectorise/Vectorise/Builtins/Base.hs | 2 +- .../vectorise/Vectorise/Builtins/Initialise.hs | 2 +- compiler/vectorise/Vectorise/Env.hs | 9 +- compiler/vectorise/Vectorise/Exp.hs | 712 +++++++++++---- compiler/vectorise/Vectorise/Generic/PADict.hs | 39 +- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 27 +- compiler/vectorise/Vectorise/Monad.hs | 20 +- compiler/vectorise/Vectorise/Monad/Base.hs | 41 +- compiler/vectorise/Vectorise/Monad/Global.hs | 9 +- compiler/vectorise/Vectorise/Monad/InstEnv.hs | 18 +- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 28 +- compiler/vectorise/Vectorise/Utils/Base.hs | 19 +- compiler/vectorise/Vectorise/Utils/PADict.hs | 70 +- config.guess | 482 +++++----- configure.ac | 39 +- distrib/compare/compare.hs | 23 +- docs/comm/genesis/modules.html | 2 +- docs/users_guide/bugs.xml | 56 +- docs/users_guide/flags.xml | 78 ++- docs/users_guide/ghci.xml | 66 ++- docs/users_guide/glasgow_exts.xml | 666 +++++++++----- docs/users_guide/packages.xml | 108 ++- docs/users_guide/runghc.xml | 2 +- docs/users_guide/using.xml | 29 +- ghc.mk | 28 +- ghc/GhciMonad.hs | 48 +- ghc/GhciTags.hs | 25 +- ghc/InteractiveUI.hs | 275 ++++-- ghc/Main.hs | 25 +- ghc/ghc-bin.cabal.in | 2 +- ghc/hschooks.c | 5 +- includes/Cmm.h | 6 + includes/Rts.h | 37 +- includes/RtsAPI.h | 2 +- includes/mkDerivedConstants.c | 3 +- includes/rts/FileLock.h | 6 +- includes/rts/Hooks.h | 6 +- includes/rts/Messages.h | 15 +- includes/rts/Threads.h | 4 + includes/rts/Types.h | 6 +- includes/rts/storage/GC.h | 1 + includes/stg/DLL.h | 25 +- includes/stg/MiscClosures.h | 1 + includes/stg/Types.h | 29 +- libffi/ghc.mk | 11 +- .../Distribution/InstalledPackageInfo/Binary.hs | 4 +- libraries/gen_contents_index | 37 +- mk/config.mk.in | 15 +- mk/validate-settings.mk | 18 +- packages | 2 +- rts/Adjustor.c | 112 ++- rts/Capability.c | 18 +- rts/Capability.h | 2 +- rts/Disassembler.c | 18 +- rts/{posix => }/FileLock.c | 11 +- rts/{posix => }/FileLock.h | 0 rts/GetTime.h | 3 + rts/Linker.c | 472 ++++++++-- rts/PosixSource.h | 4 + rts/Prelude.h | 8 +- rts/PrimOps.cmm | 23 +- rts/Printer.c | 24 +- rts/ProfHeap.c | 2 +- rts/Profiling.c | 6 +- rts/RaiseAsync.c | 10 +- rts/RetainerProfile.c | 4 +- rts/RtsDllMain.c | 4 +- rts/RtsDllMain.h | 2 +- rts/RtsFlags.c | 14 +- rts/RtsStartup.c | 18 +- rts/Schedule.c | 31 +- rts/Stats.c | 26 +- rts/Stats.h | 11 +- rts/StgMiscClosures.cmm | 6 +- rts/Task.c | 4 +- rts/Ticky.c | 26 +- rts/Trace.c | 26 +- rts/eventlog/EventLog.c | 5 +- rts/eventlog/EventLog.h | 2 +- rts/ghc.mk | 26 +- rts/hooks/MallocFail.c | 2 +- rts/hooks/OutOfHeap.c | 2 +- rts/hooks/StackOverflow.c | 2 +- rts/package.conf.in | 8 +- rts/posix/GetTime.c | 38 +- rts/posix/OSMem.c | 2 +- rts/sm/Evac.c | 2 +- rts/sm/GC.c | 14 +- rts/sm/GCThread.h | 1 + rts/sm/Sanity.c | 18 +- rts/sm/Scav.c | 6 +- rts/sm/Storage.c | 25 +- rts/sm/Storage.h | 2 +- rts/win32/GetTime.c | 74 +- rts/win32/IOManager.c | 2 +- rts/win32/OSMem.c | 20 +- rts/win32/ThrIOManager.c | 6 +- rts/win32/libHSbase.def | 1 - rts/win32/libHSghc-prim.def | 1 + rules/build-package-data.mk | 8 +- rules/build-package-way.mk | 14 +- rules/build-package.mk | 2 +- rules/build-prog.mk | 4 +- rules/c-suffix-rules.mk | 22 +- rules/cmm-suffix-rules.mk | 12 +- rules/distdir-way-opts.mk | 12 +- rules/hs-suffix-rules-srcdir.mk | 30 +- rules/hs-suffix-rules.mk | 8 +- rules/package-config.mk | 15 +- rules/pretty_commands.mk | 13 + sync-all | 36 + utils/compare_sizes/Main.hs | 1 - utils/ghc-cabal/Main.hs | 44 +- utils/ghc-cabal/ghc.mk | 4 +- utils/ghc-pkg/Main.hs | 38 +- utils/ghc-pkg/ghc-pkg.wrapper | 2 +- utils/ghc-pkg/ghc.mk | 7 +- utils/ghctags/Main.hs | 16 +- utils/hp2ps/Key.c | 1 + utils/hpc/HpcMarkup.hs | 22 +- utils/runghc/ghc.mk | 3 + utils/runghc/runghc.hs | 12 +- validate | 7 +- 414 files changed, 20096 insertions(+), 15021 deletions(-) Diff suppressed because of size. To see it, use: git show 3c61dcd714d0612e61ab56dab280adeaa2ae973b _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
