[commit: ghc] master: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc (121768d)
Iavor Diatchki <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/121768dec30facc5c9ff94cf84bc9eac71e7290b
>---------------------------------------------------------------
commit 121768dec30facc5c9ff94cf84bc9eac71e7290b
Merge: df04d2d... b78b6b3...
Author: Iavor S. Diatchki <diatchki@Perun.(none)>
Date: Sat Nov 10 12:25:24 2012 -0800
Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc
.gitignore | 55 +-
compiler/basicTypes/DataCon.lhs | 2 +-
compiler/basicTypes/Id.lhs | 271 +++---
compiler/basicTypes/Module.lhs | 8 +
compiler/basicTypes/Name.lhs | 227 +++---
compiler/cmm/Cmm.hs | 12 +-
compiler/cmm/CmmBuildInfoTables.hs | 8 +-
compiler/cmm/CmmCallConv.hs | 57 +-
compiler/cmm/CmmContFlowOpt.hs | 2 +-
compiler/cmm/CmmCvt.hs | 4 +-
compiler/cmm/CmmExpr.hs | 141 ++--
compiler/cmm/CmmInfo.hs | 8 +-
compiler/cmm/CmmLayoutStack.hs | 16 +-
compiler/cmm/CmmLint.hs | 23 +-
compiler/cmm/CmmLive.hs | 78 ++-
compiler/cmm/CmmNode.hs | 60 +-
compiler/cmm/CmmOpt.hs | 4 +-
compiler/cmm/CmmParse.y | 15 +-
compiler/cmm/CmmPipeline.hs | 6 +-
compiler/cmm/CmmProcPoint.hs | 25 +-
compiler/cmm/CmmRewriteAssignments.hs | 62 +-
compiler/cmm/CmmSink.hs | 30 +-
compiler/cmm/MkGraph.hs | 20 +-
compiler/cmm/OldCmm.hs | 36 +-
compiler/cmm/OldCmmLint.hs | 2 +-
compiler/cmm/OldPprCmm.hs | 4 +-
compiler/cmm/PprC.hs | 2 +-
compiler/cmm/PprCmmDecl.hs | 4 +-
compiler/codeGen/CgUtils.hs | 14 +-
compiler/codeGen/StgCmmExpr.hs | 2 +-
compiler/codeGen/StgCmmForeign.hs | 10 +-
compiler/codeGen/StgCmmHeap.hs | 2 +-
compiler/codeGen/StgCmmLayout.hs | 4 +-
compiler/codeGen/StgCmmMonad.hs | 20 +-
compiler/codeGen/StgCmmPrim.hs | 152 ++--
compiler/deSugar/DsExpr.lhs | 3 +-
compiler/deSugar/DsForeign.lhs | 11 +-
compiler/deSugar/DsGRHSs.lhs | 3 +-
compiler/deSugar/DsMonad.lhs | 7 +-
compiler/deSugar/DsUtils.lhs | 3 +-
compiler/ghci/ByteCodeAsm.lhs | 14 +-
compiler/ghci/RtClosureInspect.hs | 39 +-
compiler/llvmGen/LlvmCodeGen.hs | 6 +-
compiler/llvmGen/LlvmCodeGen/Base.hs | 38 +-
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 69 +-
compiler/llvmGen/LlvmCodeGen/Ppr.hs | 4 +-
compiler/llvmGen/LlvmCodeGen/Regs.hs | 6 +
compiler/main/DriverMkDepend.hs | 44 +-
compiler/main/DynFlags.hs | 27 +-
compiler/main/InteractiveEval.hs | 10 +-
compiler/nativeGen/AsmCodeGen.lhs | 28 +-
compiler/nativeGen/NCGMonad.hs | 105 +--
compiler/nativeGen/PIC.hs | 16 +-
compiler/nativeGen/PPC/CodeGen.hs | 4 +-
compiler/nativeGen/PPC/Ppr.hs | 2 +-
compiler/nativeGen/PPC/RegInfo.hs | 7 +-
compiler/nativeGen/RegAlloc/Graph/Coalesce.hs | 2 +-
compiler/nativeGen/RegAlloc/Graph/Spill.hs | 4 +-
compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 4 +-
compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 2 +-
compiler/nativeGen/RegAlloc/Linear/Main.hs | 10 +-
compiler/nativeGen/RegAlloc/Liveness.hs | 42 +-
compiler/nativeGen/SPARC/CodeGen.hs | 4 +-
compiler/nativeGen/SPARC/CodeGen/Expand.hs | 4 +-
compiler/nativeGen/SPARC/Ppr.hs | 2 +-
compiler/nativeGen/X86/CodeGen.hs | 13 +-
compiler/nativeGen/X86/Instr.hs | 4 +-
compiler/nativeGen/X86/Ppr.hs | 2 +-
compiler/rename/RnBinds.lhs | 1 +
compiler/rename/RnEnv.lhs | 2 +-
compiler/rename/RnExpr.lhs | 1 +
compiler/rename/RnPat.lhs | 20 +-
compiler/simplCore/CoreMonad.lhs | 8 +-
compiler/simplCore/OccurAnal.lhs | 13 +-
compiler/specialise/SpecConstr.lhs | 1065 +++++++++++------------
compiler/typecheck/TcBinds.lhs | 1 +
compiler/typecheck/TcCanonical.lhs | 21 +-
compiler/typecheck/TcEnv.lhs | 38 +-
compiler/typecheck/TcErrors.lhs | 61 +-
compiler/typecheck/TcExpr.lhs | 9 +-
compiler/typecheck/TcHsType.lhs | 15 +-
compiler/typecheck/TcInteract.lhs | 67 +-
compiler/typecheck/TcMType.lhs | 10 +-
compiler/typecheck/TcRnMonad.lhs | 3 -
compiler/typecheck/TcRnTypes.lhs | 587 +++++++-------
compiler/typecheck/TcSMonad.lhs | 66 +-
compiler/typecheck/TcTyClsDecls.lhs | 1 +
compiler/typecheck/TcType.lhs | 118 ++-
compiler/typecheck/TcUnify.lhs | 79 ++-
compiler/utils/IOEnv.hs | 5 +
compiler/utils/Maybes.lhs | 9 -
compiler/utils/UniqFM.lhs | 2 +-
compiler/vectorise/Vectorise/Generic/PADict.hs | 4 +-
compiler/vectorise/Vectorise/Monad/Naming.hs | 5 +-
docs/users_guide/flags.xml | 6 +
docs/users_guide/ghci.xml | 19 +-
docs/users_guide/glasgow_exts.xml | 1 +
docs/users_guide/profiling.xml | 4 +-
docs/users_guide/safe_haskell.xml | 52 ++
ghc.mk | 11 +-
ghc/Main.hs | 2 -
ghc/ghc.mk | 2 +-
includes/Cmm.h | 34 +-
includes/CodeGen.Platform.hs | 161 ++++
includes/Rts.h | 6 +
includes/mkDerivedConstants.c | 23 +
includes/rts/Constants.h | 5 +-
includes/rts/storage/Closures.h | 2 -
includes/stg/MachRegs.h | 62 ++-
includes/stg/Regs.h | 42 +
mk/config.mk.in | 21 +-
rts/AutoApply.h | 4 +-
rts/Exception.cmm | 17 +-
rts/HeapStackCheck.cmm | 19 +-
rts/PrimOps.cmm | 15 +-
rts/RetainerProfile.c | 5 +-
rts/STM.c | 15 -
rts/STM.h | 8 -
rts/StgCRun.c | 2 +-
rts/StgMiscClosures.cmm | 2 +-
rts/ghc.mk | 2 +-
rts/sm/GC.c | 8 +-
rules/build-dependencies.mk | 5 +-
rules/build-package-way.mk | 4 +-
rules/build-prog.mk | 25 +-
rules/distdir-way-opts.mk | 12 +
utils/genapply/GenApply.hs | 54 +-
utils/ghc-pkg/Main.hs | 2 +-
utils/ghc-pkg/ghc.mk | 15 +-
utils/touchy/touchy.c | 138 ++-
130 files changed, 2898 insertions(+), 2043 deletions(-)