[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (8919b2f)
Simon Peyton Jones
simonpj at microsoft.com
Fri Jul 29 12:22:16 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8919b2f73893b4dc8ad572ca15a51a2732be141c
>---------------------------------------------------------------
commit 8919b2f73893b4dc8ad572ca15a51a2732be141c
Merge: eab7f5f... 81c6183...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date: Fri Jul 29 07:49:10 2011 +0100
Merge branch 'master' of http://darcs.haskell.org/ghc
.gitignore | 5 +-
Makefile | 4 +-
aclocal.m4 | 60 +-
boot | 1 +
compiler/basicTypes/BasicTypes.lhs | 51 +-
compiler/basicTypes/DataCon.lhs | 5 +-
compiler/basicTypes/Id.lhs | 4 +-
compiler/basicTypes/IdInfo.lhs | 2 +-
compiler/basicTypes/MkId.lhs | 6 +-
compiler/basicTypes/NameSet.lhs | 18 +-
compiler/basicTypes/Var.lhs | 3 +-
compiler/basicTypes/VarEnv.lhs | 23 +-
compiler/basicTypes/VarSet.lhs | 5 +-
compiler/cmm/CLabel.hs | 49 +-
compiler/cmm/Cmm.hs | 4 +-
compiler/cmm/CmmBuildInfoTables.hs | 10 +-
compiler/cmm/CmmCvt.hs | 17 +-
compiler/cmm/CmmDecl.hs | 24 +-
compiler/cmm/CmmInfo.hs | 12 +-
compiler/cmm/CmmLint.hs | 24 +-
compiler/cmm/CmmMachOp.hs | 26 +-
compiler/cmm/CmmNode.hs | 11 +-
compiler/cmm/CmmOpt.hs | 18 +-
compiler/cmm/CmmParse.y | 41 +-
compiler/cmm/CmmPipeline.hs | 35 +-
compiler/cmm/CmmProcPoint.hs | 13 +-
compiler/cmm/CmmType.hs | 14 +-
compiler/cmm/OldCmm.hs | 13 +-
compiler/cmm/OldPprCmm.hs | 19 +-
compiler/cmm/PprC.hs | 130 +-
compiler/cmm/PprCmm.hs | 49 +-
compiler/cmm/PprCmmDecl.hs | 54 +-
compiler/codeGen/CgCase.lhs | 19 +
compiler/codeGen/CgExpr.lhs | 7 +
compiler/codeGen/CgHeapery.lhs | 7 +-
compiler/codeGen/CgHpc.hs | 6 +-
compiler/codeGen/CgInfoTbls.hs | 10 +-
compiler/codeGen/CgMonad.lhs | 2 +-
compiler/codeGen/CgPrimOp.hs | 20 +
compiler/codeGen/CgUtils.hs | 22 +-
compiler/codeGen/ClosureInfo.lhs | 53 +-
compiler/codeGen/CodeGen.lhs | 4 +-
compiler/codeGen/StgCmm.hs | 4 +-
compiler/codeGen/StgCmmClosure.hs | 30 +-
compiler/codeGen/StgCmmExpr.hs | 21 +
compiler/codeGen/StgCmmHpc.hs | 11 +-
compiler/codeGen/StgCmmLayout.hs | 2 +-
compiler/codeGen/StgCmmMonad.hs | 2 +-
compiler/codeGen/StgCmmPrim.hs | 12 +
compiler/codeGen/StgCmmUtils.hs | 14 +-
compiler/coreSyn/CoreFVs.lhs | 47 +-
compiler/coreSyn/CoreLint.lhs | 4 +-
compiler/coreSyn/CorePrep.lhs | 23 +-
compiler/coreSyn/CoreSubst.lhs | 52 +-
compiler/coreSyn/CoreSyn.lhs | 228 ++--
compiler/coreSyn/CoreTidy.lhs | 2 +-
compiler/coreSyn/CoreUnfold.lhs | 177 ++-
compiler/coreSyn/CoreUtils.lhs | 22 +-
compiler/coreSyn/PprCore.lhs | 34 +-
compiler/deSugar/Coverage.lhs | 25 +-
compiler/deSugar/Desugar.lhs | 17 +-
compiler/deSugar/DsBinds.lhs | 7 +-
compiler/deSugar/DsExpr.lhs | 24 +-
compiler/deSugar/DsForeign.lhs | 53 +-
compiler/deSugar/DsMeta.hs | 23 +-
compiler/deSugar/DsMonad.lhs | 7 +-
compiler/deSugar/Match.lhs | 14 +-
compiler/deSugar/MatchLit.lhs | 4 +
compiler/ghc.cabal.in | 2 +-
compiler/ghc.mk | 6 -
compiler/ghci/ByteCodeGen.lhs | 45 +-
compiler/ghci/Linker.lhs | 37 +-
compiler/hsSyn/Convert.lhs | 171 ++-
compiler/hsSyn/HsBinds.lhs | 6 +-
compiler/hsSyn/HsDecls.lhs | 5 +-
compiler/hsSyn/HsExpr.lhs | 88 +-
compiler/hsSyn/HsLit.lhs | 10 +-
compiler/hsSyn/HsPat.lhs | 39 +-
compiler/hsSyn/HsTypes.lhs | 6 +-
compiler/hsSyn/HsUtils.lhs | 60 +-
compiler/iface/BinIface.hs | 31 +-
compiler/iface/BuildTyCl.lhs | 50 +-
compiler/iface/IfaceSyn.lhs | 46 +-
compiler/iface/IfaceType.lhs | 11 +-
compiler/iface/LoadIface.lhs | 5 +
compiler/iface/MkIface.lhs | 161 +-
compiler/iface/TcIface.lhs | 8 +-
compiler/llvmGen/Llvm/PpLlvm.hs | 29 +-
compiler/llvmGen/Llvm/Types.hs | 59 +-
compiler/llvmGen/LlvmCodeGen.hs | 44 +-
compiler/llvmGen/LlvmCodeGen/Base.hs | 6 +-
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 21 +-
compiler/llvmGen/LlvmCodeGen/Data.hs | 13 +-
compiler/llvmGen/LlvmCodeGen/Ppr.hs | 22 +-
compiler/llvmGen/LlvmMangler.hs | 120 +-
compiler/main/CmdLineParser.hs | 6 +-
compiler/main/CodeOutput.lhs | 2 +-
compiler/main/DriverPipeline.hs | 199 ++-
compiler/main/DynFlags.hs | 266 ++--
compiler/main/ErrUtils.lhs | 10 +-
compiler/main/GHC.hs | 21 +-
compiler/main/GhcMake.hs | 96 +-
compiler/main/HeaderInfo.hs | 14 +-
compiler/main/HscMain.lhs | 180 ++-
compiler/main/HscTypes.lhs | 149 ++-
compiler/main/InteractiveEval.hs | 2 +-
compiler/main/StaticFlags.hs | 13 +-
compiler/main/SysTools.lhs | 44 +-
compiler/main/TidyPgm.lhs | 181 ++-
compiler/nativeGen/AsmCodeGen.lhs | 120 +-
compiler/nativeGen/Instruction.hs | 244 ++--
compiler/nativeGen/NCGMonad.hs | 16 +-
compiler/nativeGen/PIC.hs | 11 +-
compiler/nativeGen/PPC/CodeGen.hs | 30 +-
compiler/nativeGen/PPC/Instr.hs | 49 +-
compiler/nativeGen/PPC/Ppr.hs | 194 ++--
compiler/nativeGen/PPC/RegInfo.hs | 22 +-
compiler/nativeGen/PprInstruction.hs | 2 +
compiler/nativeGen/RegAlloc/Graph/Coalesce.hs | 6 +-
compiler/nativeGen/RegAlloc/Graph/Main.hs | 43 +-
compiler/nativeGen/RegAlloc/Graph/Spill.hs | 12 +-
compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 101 +-
compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 13 +-
compiler/nativeGen/RegAlloc/Graph/Stats.hs | 70 +-
compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 27 +-
compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 10 +-
.../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 96 +-
compiler/nativeGen/RegAlloc/Linear/Main.hs | 189 ++-
compiler/nativeGen/RegAlloc/Linear/StackMap.hs | 5 +-
compiler/nativeGen/RegAlloc/Linear/State.hs | 17 +-
compiler/nativeGen/RegAlloc/Linear/Stats.hs | 4 +-
compiler/nativeGen/RegAlloc/Liveness.hs | 1163 +++++++-------
compiler/nativeGen/SPARC/CodeGen.hs | 36 +-
compiler/nativeGen/SPARC/CodeGen/CCall.hs | 19 +-
compiler/nativeGen/SPARC/CodeGen/Expand.hs | 2 +-
compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 10 +-
compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 9 +-
compiler/nativeGen/SPARC/CodeGen/Sanity.hs | 14 +-
compiler/nativeGen/SPARC/Instr.hs | 44 +-
compiler/nativeGen/SPARC/Ppr.hs | 52 +-
compiler/nativeGen/SPARC/ShortcutJump.hs | 23 +-
compiler/nativeGen/TargetReg.hs | 51 +-
compiler/nativeGen/X86/CodeGen.hs | 704 ++++----
compiler/nativeGen/X86/Instr.hs | 60 +-
compiler/nativeGen/X86/Ppr.hs | 648 ++++----
compiler/nativeGen/X86/RegInfo.hs | 22 +-
compiler/parser/Lexer.x | 962 ++++++------
compiler/parser/Parser.y.pp | 20 +-
compiler/parser/ParserCore.y | 2 +-
compiler/prelude/ForeignCall.lhs | 17 +-
compiler/prelude/PrelNames.lhs | 1266 ++++++++-------
compiler/prelude/PrelRules.lhs | 167 ++-
compiler/prelude/TysWiredIn.lhs | 19 +
compiler/prelude/primops.txt.pp | 15 +
compiler/rename/RnBinds.lhs | 9 +-
compiler/rename/RnEnv.lhs | 51 +-
compiler/rename/RnNames.lhs | 169 ++-
compiler/rename/RnPat.lhs | 57 +-
compiler/rename/RnSource.lhs | 18 +-
compiler/rename/RnTypes.lhs | 45 +-
compiler/simplCore/CSE.lhs | 157 +-
compiler/simplCore/CoreMonad.lhs | 96 +-
compiler/simplCore/FloatOut.lhs | 340 +++--
compiler/simplCore/OccurAnal.lhs | 818 ++++++-----
compiler/simplCore/SetLevels.lhs | 354 +++--
compiler/simplCore/SimplCore.lhs | 68 +-
compiler/simplCore/SimplEnv.lhs | 8 +-
compiler/simplCore/SimplUtils.lhs | 39 +-
compiler/simplCore/Simplify.lhs | 29 +-
compiler/specialise/Specialise.lhs | 3 +
compiler/stgSyn/StgLint.lhs | 191 ++-
compiler/stranal/WwLib.lhs | 2 +-
compiler/typecheck/TcBinds.lhs | 2 +-
compiler/typecheck/TcDeriv.lhs | 24 +-
compiler/typecheck/TcEnv.lhs | 2 -
compiler/typecheck/TcErrors.lhs | 140 +-
compiler/typecheck/TcExpr.lhs | 18 +-
compiler/typecheck/TcForeign.lhs | 18 +-
compiler/typecheck/TcGenDeriv.lhs | 38 +-
compiler/typecheck/TcHsSyn.lhs | 8 +-
compiler/typecheck/TcInstDcls.lhs | 487 +++---
compiler/typecheck/TcMType.lhs | 47 +-
compiler/typecheck/TcRnDriver.lhs | 39 +-
compiler/typecheck/TcRnMonad.lhs | 32 +-
compiler/typecheck/TcRnTypes.lhs | 85 +-
compiler/typecheck/TcRules.lhs | 9 +-
compiler/typecheck/TcSimplify.lhs | 5 +-
compiler/typecheck/TcSplice.lhs | 7 +-
compiler/typecheck/TcTyClsDecls.lhs | 3 +
compiler/typecheck/TcType.lhs | 22 +-
compiler/types/Class.lhs | 26 +-
compiler/types/Coercion.lhs | 135 +-
compiler/types/InstEnv.lhs | 4 +-
compiler/types/OptCoercion.lhs | 100 +-
compiler/types/TyCon.lhs | 9 +-
compiler/types/Type.lhs | 68 +-
compiler/types/TypeRep.lhs | 6 +-
compiler/utils/Binary.hs | 26 +
compiler/utils/Digraph.lhs | 88 +-
compiler/utils/Fingerprint.hsc | 57 +-
compiler/utils/FiniteMap.lhs | 1 +
compiler/utils/Outputable.lhs | 46 +
compiler/utils/Panic.lhs | 10 +-
compiler/utils/Platform.hs | 4 +
compiler/utils/UniqFM.lhs | 13 +-
compiler/utils/Util.lhs | 6 +-
compiler/utils/md5.c | 3 +
compiler/vectorise/Vectorise.hs | 4 +-
compiler/vectorise/Vectorise/Exp.hs | 4 +-
compiler/vectorise/Vectorise/Type/PADict.hs | 2 +-
configure.ac | 70 +-
distrib/MacOS/mkinstaller | 2 +-
distrib/configure.ac.in | 2 +
docs/users_guide/6.10.1-notes.xml | 1255 --------------
docs/users_guide/6.12.1-notes.xml | 1304 ---------------
docs/users_guide/6.6-notes.xml | 1718 --------------------
docs/users_guide/7.0.1-notes.xml | 1226 --------------
docs/users_guide/extending_ghc.xml | 284 ++++
docs/users_guide/ffi-chap.xml | 4 +-
docs/users_guide/flags.xml | 53 +-
docs/users_guide/ghci.xml | 4 +
docs/users_guide/glasgow_exts.xml | 220 ++--
docs/users_guide/intro.xml | 2 +-
docs/users_guide/runtime_control.xml | 61 +-
docs/users_guide/safe_haskell.xml | 812 +++++-----
docs/users_guide/ug-book.xml.in | 1 +
docs/users_guide/ug-ent.xml.in | 3 +-
ghc.mk | 55 +-
ghc/InteractiveUI.hs | 106 +-
ghc/Main.hs | 6 +-
ghc/ghc-bin.cabal.in | 2 +-
ghc/ghc.mk | 1 +
includes/rts/EventLogFormat.h | 21 +-
includes/rts/Flags.h | 4 +-
includes/rts/Globals.h | 1 -
includes/rts/storage/ClosureMacros.h | 4 +-
includes/stg/SMP.h | 2 +-
libraries/bin-package-db/bin-package-db.cabal | 2 +-
mk/build.mk.sample | 23 +
mk/config.mk.in | 6 +-
mk/validate-settings.mk | 16 +
packages | 2 +-
quickcheck/HeaderInfoTests.hs | 129 --
quickcheck/README | 9 -
quickcheck/RunTests.hs | 62 -
quickcheck/run.sh | 23 -
rts/Adjustor.c | 89 +-
rts/AdjustorAsm.S | 7 +-
rts/Capability.c | 76 +-
rts/Capability.h | 10 +-
rts/Globals.c | 8 -
rts/Interpreter.c | 20 +-
rts/Linker.c | 18 +-
rts/Printer.c | 4 -
rts/ProfHeap.c | 171 ++-
rts/ProfHeap.h | 4 +-
rts/Profiling.h | 7 +
rts/RetainerProfile.c | 10 +
rts/RtsFlags.c | 60 +-
rts/RtsProbes.d | 14 +-
rts/STM.c | 4 +-
rts/Schedule.c | 43 +-
rts/Sparks.c | 75 +-
rts/Sparks.h | 42 +-
rts/Stats.c | 43 +-
rts/Stats.h | 2 +-
rts/StgCRun.c | 64 +-
rts/StgRun.h | 4 +
rts/Task.c | 4 +-
rts/Trace.c | 174 ++-
rts/Trace.h | 205 ++-
rts/WSDeque.c | 2 +-
rts/eventlog/EventLog.c | 111 ++-
rts/eventlog/EventLog.h | 12 +
rts/ghc.mk | 6 +-
rts/sm/GC.c | 25 +-
rts/sm/GC.h | 4 +-
rts/sm/GCUtils.c | 7 +-
rts/sm/Sanity.c | 4 -
rules/build-package.mk | 2 +
rules/extra-packages.mk | 6 +-
settings.in | 9 +-
sync-all | 372 +++--
utils/fingerprint/fingerprint.py | 2 +-
utils/ghc-cabal/ghc-cabal.cabal | 2 +-
utils/ghc-cabal/ghc.mk | 13 +-
utils/ghc-pkg/ghc-pkg.cabal | 2 +-
utils/ghc-pkg/ghc.mk | 2 +-
utils/ghctags/Main.hs | 4 +-
utils/lndir/lndir.c | 2 +
utils/runghc/runghc.cabal.in | 2 +-
validate | 9 +-
292 files changed, 10370 insertions(+), 13582 deletions(-)
More information about the Cvs-ghc
mailing list