[commit: ghc] ghc-lwc: WIP merge (5d1ff7c)
Sivaramakrishnan Krishnamoorthy Chandrasekaran
kc at galois.com
Sun May 6 18:14:05 CEST 2012
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : ghc-lwc
http://hackage.haskell.org/trac/ghc/changeset/5d1ff7c1b8fafd917483965cd89ba64c50b744d8
>---------------------------------------------------------------
commit 5d1ff7c1b8fafd917483965cd89ba64c50b744d8
Merge: ffa5408... 2bc9d89...
Author: kc <chandras at cs.purdue.edu>
Date: Sat May 5 12:01:36 2012 -0400
WIP merge
.authorspellings | 29 -
.darcs-boring | 256 --
.gitignore | 3 +
aclocal.m4 | 127 +-
compiler/basicTypes/DataCon.lhs | 104 +-
compiler/basicTypes/MkId.lhs | 50 +-
compiler/basicTypes/Name.lhs | 3 +
compiler/basicTypes/NameEnv.lhs | 32 +-
compiler/basicTypes/OccName.lhs | 30 +-
compiler/basicTypes/RdrName.lhs | 8 +-
compiler/basicTypes/SrcLoc.lhs | 7 +-
compiler/basicTypes/Var.lhs | 47 +-
compiler/cmm/Cmm.hs | 10 +-
compiler/cmm/CmmBuildInfoTables.hs | 6 +-
compiler/cmm/CmmCvt.hs | 6 +-
compiler/cmm/CmmExpr.hs | 4 +
compiler/cmm/CmmLint.hs | 18 +-
compiler/cmm/CmmMachOp.hs | 7 +
compiler/cmm/CmmOpt.hs | 11 +-
compiler/cmm/CmmParse.y | 21 +-
compiler/cmm/CmmPipeline.hs | 4 +-
compiler/cmm/CmmStackLayout.hs | 6 +-
compiler/cmm/CmmType.hs | 6 +
compiler/cmm/MkGraph.hs | 2 +-
compiler/cmm/OldCmm.hs | 202 +-
compiler/cmm/OldCmmUtils.hs | 1 +
compiler/cmm/OldPprCmm.hs | 43 +-
compiler/cmm/PprC.hs | 70 +-
compiler/codeGen/CgBindery.lhs | 383 ++--
compiler/codeGen/CgCallConv.hs | 223 +-
compiler/codeGen/CgCase.lhs | 526 ++--
compiler/codeGen/CgClosure.lhs | 12 +-
compiler/codeGen/CgCon.lhs | 13 +-
compiler/codeGen/CgExpr.lhs | 8 +-
compiler/codeGen/CgForeignCall.hs | 4 +-
compiler/codeGen/CgHeapery.lhs | 90 +-
compiler/codeGen/CgInfoTbls.hs | 8 +-
compiler/codeGen/CgMonad.lhs | 967 +++---
compiler/codeGen/CgPrimOp.hs | 343 ++-
compiler/codeGen/CgTailCall.lhs | 90 +-
compiler/codeGen/CgUtils.hs | 5 +-
compiler/codeGen/ClosureInfo.lhs | 15 +-
compiler/codeGen/CodeGen.lhs | 158 +-
compiler/codeGen/StgCmmClosure.hs | 7 +
compiler/codeGen/StgCmmForeign.hs | 4 +-
compiler/codeGen/StgCmmMonad.hs | 4 +-
compiler/codeGen/StgCmmPrim.hs | 24 +-
compiler/coreSyn/CoreArity.lhs | 10 +-
compiler/coreSyn/CoreFVs.lhs | 18 +-
compiler/coreSyn/CoreLint.lhs | 640 ++--
compiler/coreSyn/CorePrep.lhs | 14 +-
compiler/coreSyn/CoreSyn.lhs | 69 +-
compiler/coreSyn/CoreUnfold.lhs | 90 +-
compiler/coreSyn/CoreUtils.lhs | 202 +-
compiler/coreSyn/MkCore.lhs | 32 +-
compiler/coreSyn/MkExternalCore.lhs | 15 +-
compiler/coreSyn/PprCore.lhs | 8 +-
compiler/coreSyn/TrieMap.lhs | 77 +-
compiler/deSugar/Coverage.lhs | 21 +-
compiler/deSugar/Desugar.lhs | 2 +-
compiler/deSugar/DsArrows.lhs | 4 +-
compiler/deSugar/DsBinds.lhs | 190 +-
compiler/deSugar/DsCCall.lhs | 2 +-
compiler/deSugar/DsExpr.lhs | 10 +-
compiler/deSugar/DsExpr.lhs-boot | 15 +-
compiler/deSugar/DsForeign.lhs | 83 +-
compiler/deSugar/DsListComp.lhs | 41 +-
compiler/deSugar/DsMeta.hs | 386 ++-
compiler/deSugar/DsMonad.lhs | 19 +-
compiler/deSugar/DsUtils.lhs | 2 +-
compiler/deSugar/Match.lhs | 4 +-
compiler/deSugar/Match.lhs-boot | 51 +-
compiler/deSugar/MatchCon.lhs | 15 +-
compiler/ghc.cabal.in | 42 +-
compiler/ghc.mk | 26 +-
compiler/ghci/ByteCodeAsm.lhs | 598 ++--
compiler/ghci/ByteCodeGen.lhs | 114 +-
compiler/ghci/ByteCodeItbls.lhs | 28 +-
compiler/ghci/ByteCodeLink.lhs | 13 +-
compiler/ghci/LibFFI.hsc | 4 +-
compiler/ghci/Linker.lhs | 567 ++--
compiler/ghci/ObjLink.lhs | 7 -
compiler/ghci/RtClosureInspect.hs | 4 +-
compiler/hsSyn/Convert.lhs | 173 +-
compiler/hsSyn/HsBinds.lhs | 8 +-
compiler/hsSyn/HsDecls.lhs | 438 ++--
compiler/hsSyn/HsExpr.lhs | 42 +-
compiler/hsSyn/HsExpr.lhs-boot | 19 +-
compiler/hsSyn/HsImpExp.lhs | 19 +-
compiler/hsSyn/HsPat.lhs | 9 +-
compiler/hsSyn/HsSyn.lhs | 3 +-
compiler/hsSyn/HsTypes.lhs | 314 ++-
compiler/hsSyn/HsUtils.lhs | 109 +-
compiler/iface/BinIface.hs | 182 +-
compiler/iface/BuildTyCl.lhs | 90 +-
compiler/iface/FlagChecker.hs | 38 +-
compiler/iface/IfaceSyn.lhs | 212 +-
compiler/iface/IfaceType.lhs | 141 +-
compiler/iface/LoadIface.lhs | 24 +-
compiler/iface/MkIface.lhs | 283 +-
compiler/iface/TcIface.lhs | 228 +-
compiler/iface/TcIface.lhs-boot | 6 +-
compiler/llvmGen/Llvm.hs | 6 +-
compiler/llvmGen/Llvm/AbsSyn.hs | 15 +
compiler/llvmGen/Llvm/PpLlvm.hs | 126 +-
compiler/llvmGen/Llvm/Types.hs | 39 +-
compiler/llvmGen/LlvmCodeGen.hs | 6 +-
compiler/llvmGen/LlvmCodeGen/Base.hs | 16 +-
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 128 +-
compiler/llvmGen/LlvmCodeGen/Ppr.hs | 16 +-
compiler/llvmGen/LlvmCodeGen/Regs.hs | 58 +-
compiler/main/{Annotations.lhs => Annotations.hs} | 57 +-
compiler/main/CmdLineParser.hs | 3 +-
compiler/main/CodeOutput.lhs | 13 -
compiler/main/DriverPipeline.hs | 121 +-
compiler/main/DynFlags.hs | 130 +-
compiler/main/ErrUtils.lhs | 165 +-
compiler/main/ErrUtils.lhs-boot | 4 +-
compiler/main/Finder.lhs | 4 +-
compiler/main/GHC.hs | 536 ++--
compiler/main/GhcMake.hs | 1263 ++++----
compiler/main/GhcMonad.hs | 9 +-
compiler/main/HeaderInfo.hs | 28 +-
compiler/main/HscMain.hs | 250 +-
compiler/main/HscStats.hs | 160 +
compiler/main/HscStats.lhs | 15 +-
compiler/main/HscTypes.lhs | 105 +-
compiler/main/InteractiveEval.hs | 144 +-
compiler/main/PackageConfig.hs | 48 +-
compiler/main/Packages.lhs | 275 +-
compiler/main/StaticFlags.hs | 11 +-
compiler/main/SysTools.lhs | 9 +-
compiler/main/TidyPgm.lhs | 88 +-
compiler/nativeGen/AsmCodeGen.lhs | 598 ++--
compiler/nativeGen/NCGMonad.hs | 14 +-
compiler/nativeGen/PPC/CodeGen.hs | 44 +-
compiler/nativeGen/PPC/Ppr.hs | 1 +
compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 56 +-
compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 14 +-
compiler/nativeGen/RegAlloc/Linear/Main.hs | 14 +-
compiler/nativeGen/RegAlloc/Liveness.hs | 2 +-
compiler/nativeGen/SPARC/CodeGen.hs | 483 +++-
compiler/nativeGen/SPARC/CodeGen/CCall.hs | 343 --
compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 4 +-
compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot | 11 +-
compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 4 +-
compiler/nativeGen/TargetReg.hs | 70 +-
compiler/nativeGen/X86/CodeGen.hs | 296 ++-
compiler/nativeGen/X86/Instr.hs | 69 +-
compiler/nativeGen/X86/Ppr.hs | 1 +
compiler/nativeGen/X86/Regs.hs | 38 +-
compiler/parser/LexCore.hs | 54 +-
compiler/parser/Lexer.x | 55 +-
compiler/parser/Parser.y.pp | 234 +-
compiler/parser/ParserCore.y | 28 +-
compiler/parser/RdrHsSyn.lhs | 347 +--
compiler/prelude/ForeignCall.lhs | 56 +-
compiler/prelude/PrelNames.lhs | 80 +-
compiler/prelude/TysPrim.lhs | 93 +-
compiler/prelude/TysWiredIn.lhs | 64 +-
compiler/prelude/primops.txt.pp | 36 +-
compiler/rename/RnBinds.lhs | 67 +-
compiler/rename/RnEnv.lhs | 381 ++-
compiler/rename/RnExpr.lhs | 40 +-
compiler/rename/RnExpr.lhs-boot | 19 +-
compiler/rename/RnHsSyn.lhs | 159 -
compiler/rename/RnNames.lhs | 209 +-
compiler/rename/RnPat.lhs | 29 +-
compiler/rename/RnSource.lhs | 593 ++--
compiler/rename/RnTypes.lhs | 555 +++-
compiler/simplCore/CoreMonad.lhs | 22 +-
compiler/simplCore/FloatIn.lhs | 16 +-
compiler/simplCore/OccurAnal.lhs | 114 +-
compiler/simplCore/SetLevels.lhs | 45 +-
compiler/simplCore/SimplCore.lhs | 8 +-
compiler/simplCore/SimplMonad.lhs | 11 +-
compiler/simplCore/SimplUtils.lhs | 164 +-
compiler/simplCore/Simplify.lhs | 126 +-
compiler/specialise/SpecConstr.lhs | 4 +-
compiler/specialise/Specialise.lhs | 31 +-
compiler/stgSyn/CoreToStg.lhs | 14 +-
compiler/stgSyn/StgLint.lhs | 75 +-
compiler/stgSyn/StgSyn.lhs | 591 ++--
compiler/stranal/DmdAnal.lhs | 19 +-
compiler/typecheck/FamInst.lhs | 118 +-
compiler/typecheck/Inst.lhs | 160 +-
compiler/typecheck/TcArrows.lhs | 4 +-
compiler/typecheck/TcBinds.lhs | 420 +--
compiler/typecheck/TcCanonical.lhs | 1373 ++++-----
compiler/typecheck/TcClassDcl.lhs | 76 +-
compiler/typecheck/TcDeriv.lhs | 157 +-
compiler/typecheck/TcEnv.lhs | 216 +-
compiler/typecheck/TcErrors.lhs | 1040 ++++---
compiler/typecheck/TcEvidence.lhs | 118 +-
compiler/typecheck/TcExpr.lhs | 72 +-
compiler/typecheck/TcExpr.lhs-boot | 25 +-
compiler/typecheck/TcForeign.lhs | 123 +-
compiler/typecheck/TcGenDeriv.lhs | 64 +-
compiler/typecheck/TcGenGenerics.lhs | 57 +-
compiler/typecheck/TcHsSyn.lhs | 177 +-
compiler/typecheck/TcHsType.lhs | 1514 +++++-----
compiler/typecheck/TcInstDcls.lhs | 535 ++--
compiler/typecheck/TcInteract.lhs | 1035 ++++---
compiler/typecheck/TcMType.lhs | 456 ++--
compiler/typecheck/TcMatches.lhs | 52 +-
compiler/typecheck/TcMatches.lhs-boot | 23 +-
compiler/typecheck/TcPat.lhs | 45 +-
compiler/typecheck/TcRnDriver.lhs | 251 +-
compiler/typecheck/TcRnMonad.lhs | 199 +-
compiler/typecheck/TcRnTypes.lhs | 327 ++-
compiler/typecheck/TcRules.lhs | 197 +-
compiler/typecheck/TcSMonad.lhs | 1397 +++++----
compiler/typecheck/TcSimplify.lhs | 436 ++--
compiler/typecheck/TcSimplify.lhs-old | 3297 --------------------
compiler/typecheck/TcSplice.lhs | 67 +-
compiler/typecheck/TcSplice.lhs-boot | 30 +-
compiler/typecheck/TcTyClsDecls.lhs | 746 +++---
compiler/typecheck/TcTyDecls.lhs | 18 +-
compiler/typecheck/TcType.lhs | 193 +-
compiler/typecheck/TcUnify.lhs | 385 +--
compiler/typecheck/TcUnify.lhs-boot | 7 -
compiler/types/Class.lhs | 2 +-
compiler/types/Coercion.lhs | 101 +-
compiler/types/FamInstEnv.lhs | 312 ++-
compiler/types/FunDeps.lhs | 12 +-
compiler/types/InstEnv.lhs | 129 +-
compiler/types/Kind.lhs | 287 +--
compiler/types/TyCon.lhs | 852 +++---
compiler/types/TyCon.lhs-boot | 15 +-
compiler/types/Type.lhs | 152 +-
compiler/types/TypeRep.lhs | 159 +-
compiler/types/Unify.lhs | 15 +-
compiler/utils/Binary.hs | 18 +
compiler/utils/Digraph.lhs | 6 -
compiler/utils/Exception.hs | 8 -
compiler/utils/GraphColor.hs | 575 ++--
compiler/utils/GraphOps.hs | 839 +++---
compiler/utils/IOEnv.hs | 5 +
compiler/utils/Interval.hs | 116 -
compiler/utils/ListSetOps.lhs | 14 +-
compiler/utils/Outputable.lhs | 93 +-
compiler/utils/Panic.lhs | 53 +-
compiler/utils/Platform.hs | 17 +-
compiler/utils/UniqFM.lhs | 4 +-
compiler/utils/Util.lhs | 39 +-
compiler/vectorise/Vectorise.hs | 2 +-
compiler/vectorise/Vectorise/Builtins/Base.hs | 2 +-
.../vectorise/Vectorise/Builtins/Initialise.hs | 2 +-
compiler/vectorise/Vectorise/Convert.hs | 9 +-
compiler/vectorise/Vectorise/Env.hs | 9 +-
compiler/vectorise/Vectorise/Exp.hs | 649 ++++-
.../vectorise/Vectorise/Generic/Description.hs | 3 +-
compiler/vectorise/Vectorise/Generic/PADict.hs | 7 +-
compiler/vectorise/Vectorise/Generic/PAMethods.hs | 49 +-
compiler/vectorise/Vectorise/Generic/PData.hs | 61 +-
compiler/vectorise/Vectorise/Monad/InstEnv.hs | 3 +-
compiler/vectorise/Vectorise/Monad/Naming.hs | 30 +-
compiler/vectorise/Vectorise/Type/Classify.hs | 1 +
compiler/vectorise/Vectorise/Type/Env.hs | 24 +-
compiler/vectorise/Vectorise/Type/TyConDecl.hs | 4 +-
compiler/vectorise/Vectorise/Type/Type.hs | 1 +
compiler/vectorise/Vectorise/Utils/Base.hs | 1 -
compiler/vectorise/Vectorise/Utils/PADict.hs | 11 +-
config.guess | 482 ++--
configure.ac | 188 +-
distrib/configure.ac.in | 16 +-
distrib/mkDocs/mkDocs | 2 +-
distrib/remilestoning.pl | 118 +
docs/coding-style.html | 28 +-
docs/comm/rts-libs/threaded-rts.html | 2 +-
docs/ext-core/Makefile | 3 -
docs/ext-core/a4wide.sty | 39 -
docs/ext-core/code.sty | 83 -
docs/ext-core/core.bib | 124 -
docs/ext-core/core.tex | 779 -----
docs/ext-core/ghc.mk | 15 -
docs/index.html.in | 22 +-
docs/users_guide/7.6.1-notes.xml | 427 +++
docs/users_guide/bugs.xml | 85 +-
docs/users_guide/external_core.xml | 1807 +++++++++++
docs/users_guide/ffi-chap.xml | 52 +
docs/users_guide/flags.xml | 66 +-
docs/users_guide/ghci.xml | 114 +-
docs/users_guide/glasgow_exts.xml | 125 +-
docs/users_guide/intro.xml | 3 -
docs/users_guide/safe_haskell.xml | 2 +-
docs/users_guide/ug-book.xml.in | 1 +
docs/users_guide/ug-ent.xml.in | 7 +-
docs/users_guide/using.xml | 625 +++-
docs/vh/vh.xml | 591 ++--
driver/ghci/ghc.mk | 4 +-
driver/utils/cwrapper.c | 6 +-
ghc.mk | 87 +-
ghc/GhciMonad.hs | 92 +-
ghc/GhciTags.hs | 17 +-
ghc/InteractiveUI.hs | 1140 ++++---
ghc/Main.hs | 22 +-
ghc/ghc-bin.cabal.in | 2 +-
ghc/ghc.mk | 19 +-
ghc/hschooks.c | 5 +-
includes/Cmm.h | 2 +-
includes/HaskellConstants.hs | 10 +-
includes/MachDeps.h | 27 +-
includes/Rts.h | 26 +-
includes/RtsAPI.h | 18 +-
includes/Stg.h | 10 +-
includes/ghc.mk | 61 +-
includes/mkDerivedConstants.c | 41 +-
includes/rts/EventLogFormat.h | 27 +-
includes/rts/Flags.h | 18 +-
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 | 12 +-
includes/rts/storage/InfoTables.h | 22 +-
includes/rts/storage/TSO.h | 2 +-
includes/stg/DLL.h | 4 +-
includes/stg/MachRegs.h | 173 +-
includes/stg/MiscClosures.h | 1 +
includes/stg/Types.h | 29 +-
libffi/ghc.mk | 2 +-
libraries/gen_contents_index | 21 +-
libraries/integer-gmp/integer-gmp.buildinfo | 4 -
libraries/terminfo/terminfo.buildinfo | 4 -
libraries/time/include/HsTimeConfig.h | 84 -
mk/build.mk.sample | 27 +-
mk/compiler-ghc.mk | 1 -
mk/config.mk.in | 68 +-
mk/tree.mk | 4 +-
mk/validate-settings.mk | 18 +-
packages | 1 -
rts/Adjustor.c | 441 ++-
rts/Capability.c | 90 +-
rts/Capability.h | 21 +-
rts/ClosureFlags.c | 18 +-
rts/Disassembler.c | 18 +-
rts/HeapStackCheck.cmm | 10 +-
rts/Interpreter.c | 48 +-
rts/Linker.c | 429 +++-
rts/PosixSource.h | 2 +-
rts/PrimOps.cmm | 28 +-
rts/Printer.c | 26 +-
rts/ProfHeap.c | 2 +-
rts/RaiseAsync.c | 57 +-
rts/RtsFlags.c | 12 +-
rts/RtsMain.c | 11 +-
rts/RtsProbes.d | 37 +-
rts/RtsStartup.c | 9 +-
rts/Schedule.c | 306 ++-
rts/Schedule.h | 1 -
rts/Stats.c | 183 +-
rts/Stats.h | 19 +-
rts/StgCRun.c | 67 +-
rts/StgMiscClosures.cmm | 6 +-
rts/StgStartup.cmm | 12 +-
rts/Task.c | 100 +-
rts/Task.h | 30 +-
rts/Threads.c | 52 +-
rts/Ticky.c | 26 +-
rts/Trace.c | 146 +-
rts/Trace.h | 263 ++-
rts/Updates.cmm | 11 +-
rts/eventlog/EventLog.c | 201 ++-
rts/eventlog/EventLog.h | 34 +
rts/ghc.mk | 13 +-
rts/hooks/MallocFail.c | 2 +-
rts/hooks/OutOfHeap.c | 8 +-
rts/hooks/StackOverflow.c | 2 +-
rts/package.conf.in | 2 +
rts/posix/Clock.h | 35 +
rts/posix/GetTime.c | 35 +-
rts/posix/Itimer.c | 17 +-
rts/posix/OSMem.c | 2 +-
rts/posix/OSThreads.c | 1 -
rts/posix/Select.c | 17 +-
rts/posix/Signals.c | 30 +-
rts/sm/Compact.c | 2 +-
rts/sm/GC.c | 104 +-
rts/sm/GCThread.h | 1 +
rts/sm/Sanity.c | 19 +-
rts/sm/Scav.c | 4 +-
rts/sm/Storage.c | 122 +-
rts/sm/Storage.h | 3 +-
rts/win32/AwaitEvent.c | 4 +-
rts/win32/IOManager.c | 2 +-
rts/win32/OSMem.c | 4 +-
rts/win32/ThrIOManager.c | 2 +-
rts/win32/seh_excn.c | 5 +-
rules/build-package-data.mk | 6 +-
rules/build-package-way.mk | 2 +-
rules/build-package.mk | 2 +-
rules/cmm-suffix-rules.mk | 8 +-
rules/distdir-way-opts.mk | 10 +-
rules/haddock.mk | 2 +-
rules/hs-suffix-rules-srcdir.mk | 4 +-
rules/manual-package-config.mk | 4 +-
rules/package-config.mk | 4 -
rules/shell-wrapper.mk | 2 +-
settings.in | 5 +-
sync-all | 109 +-
utils/count_lines/count_lines.lprl | 3 +-
utils/fingerprint/fingerprint.py | 2 +-
utils/genapply/GenApply.hs | 646 ++--
utils/genapply/ghc.mk | 6 +-
utils/genprimopcode/Main.hs | 7 -
utils/genprimopcode/Parser.y | 1 -
utils/genprimopcode/ParserM.hs | 1 -
utils/genprimopcode/Syntax.hs | 20 +-
utils/ghc-cabal/ghc.mk | 2 +-
utils/ghc-pkg/Main.hs | 70 +-
utils/ghc-pkg/ghc.mk | 35 +-
utils/ghctags/Main.hs | 6 +-
utils/hp2ps/ghc.mk | 2 +-
validate | 18 +-
415 files changed, 27912 insertions(+), 24273 deletions(-)
Diff suppressed because of size. To see it, use:
git show 5d1ff7c1b8fafd917483965cd89ba64c50b744d8
More information about the Cvs-ghc
mailing list