Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/fb80c004f22f60d8fb21f1d9ffabb8450ee428d8 >--------------------------------------------------------------- commit fb80c004f22f60d8fb21f1d9ffabb8450ee428d8 Merge: 7a5f592... 81f43eb... Author: Iavor S. Diatchki <iavor.diatc...@gmail.com> Date: Mon Oct 15 22:43:13 2012 -0700 Merge remote-tracking branch 'origin/master' into type-nats compiler/basicTypes/MkId.lhs | 7 +- compiler/basicTypes/Name.lhs | 24 +- compiler/basicTypes/OccName.lhs | 8 +- compiler/basicTypes/Var.lhs | 4 +- compiler/cmm/CLabel.hs | 15 +- compiler/cmm/Cmm.hs | 7 +- compiler/cmm/CmmBuildInfoTables.hs | 7 +- compiler/cmm/CmmCallConv.hs | 66 +- compiler/cmm/CmmContFlowOpt.hs | 12 +- compiler/cmm/CmmCvt.hs | 31 +- compiler/cmm/CmmInfo.hs | 46 +- compiler/cmm/CmmLayoutStack.hs | 7 +- compiler/cmm/CmmLex.x | 16 +- compiler/cmm/CmmMachOp.hs | 9 +- compiler/cmm/CmmNode.hs | 46 +- compiler/cmm/CmmOpt.hs | 21 +- compiler/cmm/CmmParse.y | 803 ++++++++----- compiler/cmm/CmmPipeline.hs | 13 +- compiler/cmm/CmmProcPoint.hs | 7 +- compiler/cmm/CmmSink.hs | 79 ++- compiler/cmm/CmmType.hs | 18 +- compiler/cmm/CmmUtils.hs | 18 +- compiler/cmm/MkGraph.hs | 144 ++-- compiler/cmm/OldCmm.hs | 9 +- compiler/cmm/OldPprCmm.hs | 8 +- compiler/cmm/PprC.hs | 1 - compiler/cmm/PprCmm.hs | 17 +- compiler/cmm/SMRep.lhs | 37 +- compiler/codeGen/CgCallConv.hs | 9 +- compiler/codeGen/CgCon.lhs | 4 +- compiler/codeGen/CgExtCode.hs | 241 ---- compiler/codeGen/CgHeapery.lhs | 2 +- compiler/codeGen/CgPrimOp.hs | 35 +- compiler/codeGen/CgProf.hs | 13 +- compiler/codeGen/CgUtils.hs | 4 +- compiler/codeGen/ClosureInfo.lhs | 24 +- compiler/codeGen/StgCmm.hs | 2 +- compiler/codeGen/StgCmmBind.hs | 41 +- compiler/codeGen/StgCmmClosure.hs | 25 +- compiler/codeGen/StgCmmCon.hs | 4 +- compiler/codeGen/StgCmmExpr.hs | 4 +- compiler/codeGen/StgCmmExtCode.hs | 224 ++++ compiler/codeGen/StgCmmForeign.hs | 61 +- compiler/codeGen/StgCmmGran.hs | 6 +- compiler/codeGen/StgCmmHeap.hs | 161 ++-- compiler/codeGen/StgCmmHpc.hs | 4 +- compiler/codeGen/StgCmmLayout.hs | 44 +- compiler/codeGen/StgCmmMonad.hs | 135 ++- compiler/codeGen/StgCmmPrim.hs | 43 +- compiler/codeGen/StgCmmProf.hs | 35 +- compiler/codeGen/StgCmmTicky.hs | 2 +- compiler/codeGen/StgCmmUtils.hs | 7 +- compiler/coreSyn/CoreUnfold.lhs | 120 +- compiler/coreSyn/PprCore.lhs | 57 +- compiler/deSugar/DsBinds.lhs | 28 +- compiler/deSugar/DsExpr.lhs | 5 +- compiler/ghc.cabal.in | 2 +- compiler/ghc.mk | 117 +- compiler/ghci/Linker.lhs | 63 +- compiler/iface/BuildTyCl.lhs | 10 +- compiler/iface/MkIface.lhs | 2 +- compiler/iface/TcIface.lhs | 30 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 1 - compiler/main/CmdLineParser.hs | 10 + compiler/main/DriverPipeline.hs | 173 +--- compiler/main/DynFlags.hs | 195 +++- compiler/main/DynFlags.hs-boot | 2 - compiler/main/ErrUtils.lhs | 17 +- compiler/main/GHC.hs | 2 +- compiler/main/GhcMake.hs | 4 +- compiler/main/HscMain.hs | 6 +- compiler/main/HscTypes.lhs | 9 +- compiler/main/StaticFlagParser.hs | 33 +- compiler/main/StaticFlags.hs | 149 +-- compiler/main/SysTools.lhs | 170 +++ compiler/main/TidyPgm.lhs | 17 +- compiler/nativeGen/AsmCodeGen.lhs | 9 +- compiler/nativeGen/RegAlloc/Linear/Main.hs | 13 +- compiler/prelude/ForeignCall.lhs | 11 +- compiler/prelude/PrelNames.lhs-boot | 9 + compiler/prelude/PrelRules.lhs | 33 +- compiler/prelude/primops.txt.pp | 17 +- compiler/rename/RnNames.lhs | 2 +- compiler/simplCore/LiberateCase.lhs | 13 +- compiler/simplCore/SimplEnv.lhs | 418 ++++---- compiler/simplCore/SimplMonad.lhs | 77 +- compiler/simplCore/SimplUtils.lhs | 964 ++++++++-------- compiler/simplCore/Simplify.lhs | 67 +- compiler/specialise/SpecConstr.lhs | 2 +- compiler/specialise/Specialise.lhs | 26 +- compiler/stranal/DmdAnal.lhs | 154 ++-- compiler/stranal/WorkWrap.lhs | 10 +- compiler/typecheck/TcDeriv.lhs | 1035 +++++++++--------- compiler/typecheck/TcEnv.lhs | 3 + compiler/typecheck/TcForeign.lhs | 1 - compiler/typecheck/TcGenDeriv.lhs | 1118 +++++++++---------- compiler/typecheck/TcHsType.lhs | 35 +- compiler/types/FamInstEnv.lhs | 209 ++-- compiler/utils/Outputable.lhs | 8 +- distrib/MacFrameworks/Makefile | 31 - distrib/MacFrameworks/README | 13 - distrib/MacFrameworks/build-framework-gmp.sh | 48 - distrib/MacFrameworks/build-framework-readline.sh | 63 - distrib/MacOS/English.lproj/InfoPlist.strings | Bin 136 -> 0 bytes .../MacOS/GHC-relocatable.pmdoc/01ghc-contents.xml | 1 - distrib/MacOS/GHC-relocatable.pmdoc/01ghc.xml | 1 - distrib/MacOS/GHC-relocatable.pmdoc/index.xml | 21 - distrib/MacOS/GHC-system.pmdoc/01ghc.xml | 1 - distrib/MacOS/GHC-system.pmdoc/index.xml.in | 31 - distrib/MacOS/GHC.xcodeproj/project.pbxproj | 310 ----- distrib/MacOS/Info.plist | 28 - distrib/MacOS/installer-docs/lambda-logo.png | Bin 10511 -> 0 bytes distrib/MacOS/installer-docs/license.html | 244 ---- distrib/MacOS/installer-scripts/Uninstaller.in | 91 -- distrib/MacOS/installer-scripts/create-links.in | 38 - distrib/MacOS/installer-scripts/relocate | 14 - distrib/MacOS/mkinstaller | 105 -- distrib/cvs-build | 137 --- distrib/fake-happy | 20 - distrib/prep-bin-dist-mingw | 203 ---- distrib/prep-bin-dist-mingw-alex | 32 - distrib/prep-bin-dist-mingw-args | 33 - distrib/prep-bin-dist-mingw-greencard | 33 - distrib/prep-bin-dist-mingw-haddock | 32 - distrib/prep-bin-dist-mingw-happy | 32 - distrib/prep-bin-dist-mingw-hdirect | 36 - docs/users_guide/flags.xml | 30 +- docs/users_guide/glasgow_exts.xml | 2 +- ghc.mk | 10 +- includes/Cmm.h | 299 ++++-- includes/Rts.h | 1 - includes/rts/Constants.h | 24 - includes/rts/EventLogFormat.h | 6 +- includes/rts/storage/ClosureMacros.h | 8 - includes/rts/storage/ClosureTypes.h | 55 +- includes/rts/storage/Closures.h | 56 +- includes/rts/storage/Liveness.h | 34 - includes/rts/storage/SMPClosureOps.h | 2 +- includes/stg/MiscClosures.h | 56 +- includes/stg/Regs.h | 331 +------ mk/config.mk.in | 3 +- rts/Apply.cmm | 72 +- rts/AutoApply.h | 8 +- rts/ClosureFlags.c | 5 +- rts/Exception.cmm | 238 +++-- rts/HeapStackCheck.cmm | 510 ++++----- rts/Interpreter.c | 60 +- rts/LdvProfile.c | 1 - rts/Linker.c | 648 ++++++----- rts/PrimOps.cmm | 1184 +++++++++----------- rts/Printer.c | 35 +- rts/RaiseAsync.c | 2 +- rts/RetainerProfile.c | 29 +- rts/RtsProbes.d | 1 + rts/StgMiscClosures.cmm | 126 ++- rts/StgStartup.cmm | 56 +- rts/StgStdThunks.cmm | 305 +++--- rts/Trace.c | 22 + rts/Trace.h | 10 + rts/Updates.cmm | 97 +- rts/Updates.h | 17 +- rts/eventlog/EventLog.c | 23 + rts/eventlog/EventLog.h | 2 + rts/ghc.mk | 11 +- rts/posix/Itimer.c | 3 + rts/sm/Compact.c | 32 +- rts/sm/Evac.c | 1 - rts/sm/Sanity.c | 27 - rts/sm/Scav.c | 26 - rules/build-package-data.mk | 5 +- rules/build-package-way.mk | 20 +- rules/build-package.mk | 4 + rules/build-prog.mk | 17 +- rules/hs-suffix-rules-srcdir.mk | 6 + rules/shell-wrapper.mk | 4 + utils/genapply/GenApply.hs | 14 +- utils/ghc-cabal/Main.hs | 7 +- utils/ghc-pkg/Main.hs | 5 +- utils/ghctags/ghc.mk | 6 +- utils/ghctags/ghctags.cabal | 22 + utils/hpc/ghc.mk | 6 +- utils/hpc/hpc-bin.cabal | 11 +- 182 files changed, 6334 insertions(+), 7925 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
