Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : new-typeable
http://hackage.haskell.org/trac/ghc/changeset/39f55fbf760b38902af2698debfafe1479b37f53 >--------------------------------------------------------------- commit 39f55fbf760b38902af2698debfafe1479b37f53 Merge: bf0bfb7... 5874a66... Author: Jose Pedro Magalhaes <j...@cs.ox.ac.uk> Date: Mon Nov 19 11:14:26 2012 +0000 Merge remote-tracking branch 'origin' into new-typeable Conflicts: compiler/hsSyn/HsExpr.lhs-boot compiler/typecheck/TcDeriv.lhs compiler/typecheck/TcGenDeriv.lhs .gitignore | 98 +-- aclocal.m4 | 174 +--- compiler/basicTypes/DataCon.lhs | 71 +- compiler/basicTypes/Id.lhs | 271 +++--- compiler/basicTypes/MkId.lhs | 9 +- compiler/basicTypes/Module.lhs | 8 + compiler/basicTypes/Name.lhs | 251 ++-- compiler/basicTypes/OccName.lhs | 63 +- compiler/basicTypes/Var.lhs | 4 +- compiler/cmm/CLabel.hs | 23 +- compiler/cmm/Cmm.hs | 58 +- compiler/cmm/CmmBuildInfoTables.hs | 15 +- compiler/cmm/CmmCallConv.hs | 117 ++- compiler/cmm/CmmContFlowOpt.hs | 59 +- compiler/cmm/CmmCvt.hs | 110 -- compiler/cmm/CmmExpr.hs | 141 ++- compiler/cmm/CmmInfo.hs | 86 +- compiler/cmm/CmmLayoutStack.hs | 23 +- compiler/cmm/CmmLex.x | 16 +- compiler/cmm/CmmLint.hs | 23 +- compiler/cmm/CmmLive.hs | 78 +- compiler/cmm/CmmMachOp.hs | 9 +- compiler/cmm/CmmNode.hs | 118 ++- compiler/cmm/CmmOpt.hs | 47 +- compiler/cmm/CmmParse.y | 812 ++++++++----- compiler/cmm/CmmPipeline.hs | 73 +- compiler/cmm/CmmProcPoint.hs | 64 +- compiler/cmm/CmmRewriteAssignments.hs | 62 +- compiler/cmm/CmmSink.hs | 181 +++- compiler/cmm/CmmType.hs | 18 +- compiler/cmm/CmmUtils.hs | 34 +- compiler/cmm/MkGraph.hs | 152 ++-- compiler/cmm/OldCmm.hs | 283 ----- compiler/cmm/OldCmmLint.hs | 212 ---- compiler/cmm/OldCmmUtils.hs | 100 -- compiler/cmm/OldPprCmm.hs | 228 ---- compiler/cmm/PprC.hs | 140 ++- compiler/cmm/PprCmm.hs | 17 +- compiler/cmm/PprCmmDecl.hs | 4 +- compiler/cmm/PprCmmExpr.hs | 1 - compiler/cmm/SMRep.lhs | 42 +- compiler/codeGen/CgBindery.lhs | 564 --------- compiler/codeGen/CgBindery.lhs-boot | 11 - compiler/codeGen/CgCallConv.hs | 415 ------- compiler/codeGen/CgCase.lhs | 673 ----------- compiler/codeGen/CgClosure.lhs | 641 ----------- compiler/codeGen/CgCon.lhs | 490 -------- compiler/codeGen/CgExpr.lhs | 496 -------- compiler/codeGen/CgExpr.lhs-boot | 7 - compiler/codeGen/CgExtCode.hs | 241 ---- compiler/codeGen/CgForeignCall.hs | 322 ------ compiler/codeGen/CgHeapery.lhs | 642 ----------- compiler/codeGen/CgHpc.hs | 40 - compiler/codeGen/CgInfoTbls.hs | 374 ------ compiler/codeGen/CgLetNoEscape.lhs | 215 ---- compiler/codeGen/CgMonad.lhs | 849 -------------- compiler/codeGen/CgParallel.hs | 100 -- compiler/codeGen/CgPrimOp.hs | 1174 ------------------- compiler/codeGen/CgProf.hs | 317 ------ compiler/codeGen/CgStackery.lhs | 371 ------ compiler/codeGen/CgTailCall.lhs | 509 --------- compiler/codeGen/CgTicky.hs | 397 ------- compiler/codeGen/CgUtils.hs | 853 +------------- compiler/codeGen/ClosureInfo.lhs | 1122 ------------------ compiler/codeGen/ClosureInfo.lhs-boot | 6 - compiler/codeGen/StgCmm.hs | 4 +- compiler/codeGen/StgCmmBind.hs | 72 +- compiler/codeGen/StgCmmClosure.hs | 35 +- compiler/codeGen/StgCmmCon.hs | 8 +- compiler/codeGen/StgCmmExpr.hs | 8 +- compiler/codeGen/StgCmmExtCode.hs | 224 ++++ compiler/codeGen/StgCmmForeign.hs | 73 +- compiler/codeGen/StgCmmGran.hs | 8 +- compiler/codeGen/StgCmmHeap.hs | 173 ++-- compiler/codeGen/StgCmmHpc.hs | 4 +- compiler/codeGen/StgCmmLayout.hs | 70 +- compiler/codeGen/StgCmmMonad.hs | 135 ++- compiler/codeGen/StgCmmPrim.hs | 197 ++-- compiler/codeGen/StgCmmProf.hs | 43 +- compiler/codeGen/StgCmmTicky.hs | 4 +- compiler/codeGen/StgCmmUtils.hs | 7 +- compiler/coreSyn/CoreArity.lhs | 6 +- compiler/coreSyn/CoreLint.lhs | 3 +- compiler/coreSyn/CoreSubst.lhs | 2 +- compiler/coreSyn/CoreSyn.lhs | 2 +- compiler/coreSyn/CoreUnfold.lhs | 120 +- compiler/coreSyn/CoreUtils.lhs | 40 +- compiler/coreSyn/MkExternalCore.lhs | 2 +- compiler/coreSyn/PprCore.lhs | 59 +- compiler/deSugar/Coverage.lhs | 92 +- compiler/deSugar/Desugar.lhs | 8 +- compiler/deSugar/DsArrows.lhs | 120 +- compiler/deSugar/DsBinds.lhs | 28 +- compiler/deSugar/DsExpr.lhs | 26 +- compiler/deSugar/DsForeign.lhs | 11 +- compiler/deSugar/DsGRHSs.lhs | 25 +- compiler/deSugar/DsListComp.lhs | 42 +- compiler/deSugar/DsMeta.hs | 176 ++-- compiler/deSugar/DsMonad.lhs | 11 +- compiler/deSugar/DsUtils.lhs | 38 +- compiler/deSugar/Match.lhs | 9 +- compiler/deSugar/Match.lhs-boot | 4 +- compiler/deSugar/MatchLit.lhs | 2 +- compiler/ghc.cabal.in | 29 +- compiler/ghc.mk | 127 ++- compiler/ghci/ByteCodeAsm.lhs | 46 +- compiler/ghci/ByteCodeGen.lhs | 129 ++- compiler/ghci/ByteCodeInstr.lhs | 6 +- compiler/ghci/ByteCodeItbls.lhs | 7 +- compiler/ghci/Debugger.hs | 8 +- compiler/ghci/DebuggerUtils.hs | 2 +- compiler/ghci/Linker.lhs | 156 ++- compiler/ghci/RtClosureInspect.hs | 39 +- compiler/hsSyn/Convert.lhs | 18 +- compiler/hsSyn/HsBinds.lhs | 20 +- compiler/hsSyn/HsExpr.lhs | 552 ++++++---- compiler/hsSyn/HsExpr.lhs-boot | 28 +- compiler/hsSyn/HsUtils.lhs | 76 +- compiler/iface/BuildTyCl.lhs | 10 +- compiler/iface/FlagChecker.hs | 2 +- compiler/iface/LoadIface.lhs | 2 +- compiler/iface/MkIface.lhs | 4 +- compiler/iface/TcIface.lhs | 38 +- compiler/llvmGen/LlvmCodeGen.hs | 19 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 42 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 263 +++-- compiler/llvmGen/LlvmCodeGen/Data.hs | 2 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 6 +- compiler/llvmGen/LlvmCodeGen/Regs.hs | 6 + compiler/main/CmdLineParser.hs | 10 + compiler/main/CodeOutput.lhs | 6 +- compiler/main/DriverMkDepend.hs | 44 +- compiler/main/DriverPipeline.hs | 250 +---- compiler/main/DynFlags.hs | 782 +++++++------ compiler/main/DynFlags.hs-boot | 2 - compiler/main/ErrUtils.lhs | 67 +- compiler/main/Finder.lhs | 2 +- compiler/main/GHC.hs | 6 +- compiler/main/GhcMake.hs | 12 +- compiler/main/HeaderInfo.hs | 2 +- compiler/main/HscMain.hs | 30 +- compiler/main/HscTypes.lhs | 21 +- compiler/main/InteractiveEval.hs | 18 +- compiler/main/Packages.lhs | 14 +- compiler/main/StaticFlagParser.hs | 33 +- compiler/main/StaticFlags.hs | 149 +-- compiler/main/SysTools.lhs | 178 +++- compiler/main/TidyPgm.lhs | 21 +- compiler/nativeGen/AsmCodeGen.lhs | 116 +- compiler/nativeGen/Instruction.hs | 13 +- compiler/nativeGen/NCGMonad.hs | 105 +- compiler/nativeGen/PIC.hs | 489 ++++---- compiler/nativeGen/PPC/CodeGen.hs | 78 +- compiler/nativeGen/PPC/Instr.hs | 2 +- compiler/nativeGen/PPC/Ppr.hs | 4 +- compiler/nativeGen/PPC/RegInfo.hs | 9 +- compiler/nativeGen/PPC/Regs.hs | 2 +- compiler/nativeGen/RegAlloc/Graph/ArchBase.hs | 196 ++-- compiler/nativeGen/RegAlloc/Graph/ArchX86.hs | 188 ++-- compiler/nativeGen/RegAlloc/Graph/Coalesce.hs | 110 +- compiler/nativeGen/RegAlloc/Graph/Main.hs | 240 +++-- compiler/nativeGen/RegAlloc/Graph/Spill.hs | 195 ++-- compiler/nativeGen/RegAlloc/Graph/SpillClean.hs | 802 +++++++------- compiler/nativeGen/RegAlloc/Graph/SpillCost.hs | 363 +++--- compiler/nativeGen/RegAlloc/Graph/Stats.hs | 128 ++- compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 12 + compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs | 22 +- .../nativeGen/RegAlloc/Linear/JoinToTargets.hs | 1 - compiler/nativeGen/RegAlloc/Linear/Main.hs | 41 +- compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs | 15 +- .../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs | 233 ++-- compiler/nativeGen/RegAlloc/Linear/StackMap.hs | 37 +- compiler/nativeGen/RegAlloc/Linear/Stats.hs | 111 +- compiler/nativeGen/RegAlloc/Liveness.hs | 55 +- compiler/nativeGen/SPARC/CodeGen.hs | 77 +- compiler/nativeGen/SPARC/CodeGen/Amode.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Base.hs | 3 +- compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Expand.hs | 6 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot | 2 +- compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 2 +- compiler/nativeGen/SPARC/CodeGen/Sanity.hs | 4 +- compiler/nativeGen/SPARC/Imm.hs | 2 +- compiler/nativeGen/SPARC/Instr.hs | 2 +- compiler/nativeGen/SPARC/Ppr.hs | 6 +- compiler/nativeGen/SPARC/ShortcutJump.hs | 2 +- compiler/nativeGen/Size.hs | 2 +- compiler/nativeGen/TargetReg.hs | 15 + compiler/nativeGen/X86/CodeGen.hs | 235 ++-- compiler/nativeGen/X86/Instr.hs | 6 +- compiler/nativeGen/X86/Ppr.hs | 4 +- compiler/nativeGen/X86/Regs.hs | 2 +- compiler/parser/Lexer.x | 10 +- compiler/parser/Parser.y.pp | 67 +- compiler/parser/RdrHsSyn.lhs | 99 ++- compiler/prelude/ForeignCall.lhs | 11 +- compiler/prelude/PrelNames.lhs | 13 + compiler/prelude/PrelNames.lhs-boot | 9 + compiler/prelude/PrelRules.lhs | 130 ++- compiler/prelude/TysWiredIn.lhs | 6 +- compiler/prelude/primops.txt.pp | 57 +- compiler/profiling/ProfInit.hs | 2 +- compiler/profiling/SCCfinal.lhs | 4 +- compiler/rename/RnBinds.lhs | 121 ++- compiler/rename/RnEnv.lhs | 52 +- compiler/rename/RnExpr.lhs | 409 ++++---- compiler/rename/RnExpr.lhs-boot | 16 +- compiler/rename/RnNames.lhs | 16 +- compiler/rename/RnPat.lhs | 24 +- compiler/rename/RnTypes.lhs | 12 +- compiler/simplCore/CoreMonad.lhs | 24 +- compiler/simplCore/FloatOut.lhs | 2 +- compiler/simplCore/LiberateCase.lhs | 13 +- compiler/simplCore/OccurAnal.lhs | 348 +++--- compiler/simplCore/SimplCore.lhs | 24 +- compiler/simplCore/SimplEnv.lhs | 418 ++++---- compiler/simplCore/SimplMonad.lhs | 77 +- compiler/simplCore/SimplUtils.lhs | 972 ++++++++-------- compiler/simplCore/Simplify.lhs | 71 +- compiler/simplStg/SimplStg.lhs | 105 +- compiler/specialise/SpecConstr.lhs | 1067 +++++++++--------- compiler/specialise/Specialise.lhs | 26 +- compiler/stgSyn/StgSyn.lhs | 2 +- compiler/stranal/DmdAnal.lhs | 154 ++-- compiler/stranal/WorkWrap.lhs | 10 +- compiler/typecheck/Inst.lhs | 35 +- compiler/typecheck/TcArrows.lhs | 69 +- compiler/typecheck/TcBinds.lhs | 9 +- compiler/typecheck/TcCanonical.lhs | 99 +-- compiler/typecheck/TcDeriv.lhs | 1040 +++++++++--------- compiler/typecheck/TcEnv.lhs | 41 +- compiler/typecheck/TcErrors.lhs | 174 ++- compiler/typecheck/TcExpr.lhs | 21 +- compiler/typecheck/TcForeign.lhs | 1 - compiler/typecheck/TcGenDeriv.lhs | 1136 +++++++++---------- compiler/typecheck/TcHsSyn.lhs | 182 ++- compiler/typecheck/TcHsType.lhs | 197 ++-- compiler/typecheck/TcInstDcls.lhs | 8 +- compiler/typecheck/TcInteract.lhs | 147 ++- compiler/typecheck/TcMType.lhs | 23 +- compiler/typecheck/TcMatches.lhs | 141 ++-- compiler/typecheck/TcMatches.lhs-boot | 11 +- compiler/typecheck/TcPat.lhs | 2 +- compiler/typecheck/TcRnDriver.lhs | 34 +- compiler/typecheck/TcRnMonad.lhs | 59 +- compiler/typecheck/TcRnTypes.lhs | 606 +++++----- compiler/typecheck/TcSMonad.lhs | 94 +- compiler/typecheck/TcSimplify.lhs | 297 +++--- compiler/typecheck/TcSplice.lhs | 18 +- compiler/typecheck/TcSplice.lhs-boot | 2 +- compiler/typecheck/TcTyClsDecls.lhs | 39 +- compiler/typecheck/TcType.lhs | 156 +++- compiler/typecheck/TcUnify.lhs | 211 +++-- compiler/types/FamInstEnv.lhs | 209 ++-- compiler/types/Kind.lhs | 2 +- compiler/types/TyCon.lhs | 66 +- compiler/utils/IOEnv.hs | 5 + compiler/utils/Maybes.lhs | 9 - compiler/utils/Outputable.lhs | 8 +- compiler/utils/Platform.hs | 3 + compiler/utils/UniqFM.lhs | 2 +- compiler/utils/Util.lhs | 12 + compiler/vectorise/Vectorise/Exp.hs | 4 +- compiler/vectorise/Vectorise/Generic/PADict.hs | 4 +- compiler/vectorise/Vectorise/Monad/Base.hs | 2 +- compiler/vectorise/Vectorise/Monad/Naming.hs | 5 +- configure.ac | 32 +- 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/configure.ac.in | 3 +- 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 | 48 +- docs/users_guide/ghci.xml | 19 +- docs/users_guide/glasgow_exts.xml | 212 +++- docs/users_guide/profiling.xml | 4 +- docs/users_guide/safe_haskell.xml | 52 + driver/ghci/ghc.mk | 1 + ghc.mk | 150 ++- ghc/InteractiveUI.hs | 20 +- ghc/Main.hs | 8 +- ghc/ghc.mk | 5 +- includes/Cmm.h | 314 ++++-- includes/CodeGen.Platform.hs | 161 +++ includes/Rts.h | 7 +- includes/ghc.mk | 91 +- includes/mkDerivedConstants.c | 798 ------------- includes/mkDerivedConstants.cross.awk | 350 ------ includes/mkSizeMacros.cross.awk | 82 -- includes/rts/Constants.h | 29 +- includes/rts/EventLogFormat.h | 6 +- includes/rts/storage/Block.h | 2 +- includes/rts/storage/ClosureMacros.h | 8 - includes/rts/storage/ClosureTypes.h | 24 +- includes/rts/storage/Closures.h | 58 +- includes/rts/storage/Liveness.h | 34 - includes/rts/storage/SMPClosureOps.h | 2 +- includes/stg/MachRegs.h | 62 +- includes/stg/MiscClosures.h | 67 +- includes/stg/Regs.h | 373 +------ includes/stg/RtsMachRegs.h | 6 + mk/build.mk.sample | 6 +- mk/config.mk.in | 30 +- mk/validate-settings.mk | 7 +- mk/ways.mk | 45 +- rts/Apply.cmm | 72 +- rts/AutoApply.h | 8 +- rts/Capability.c | 2 +- rts/ClosureFlags.c | 6 +- rts/Exception.cmm | 253 +++-- rts/HeapStackCheck.cmm | 527 ++++----- rts/Interpreter.c | 60 +- rts/LdvProfile.c | 2 +- rts/Linker.c | 655 ++++++----- rts/PrimOps.cmm | 1201 +++++++++----------- rts/Printer.c | 49 +- rts/ProfHeap.c | 3 +- rts/Profiling.c | 6 +- rts/RaiseAsync.c | 2 +- rts/RetainerProfile.c | 39 +- rts/RtsProbes.d | 1 + rts/STM.c | 78 +- rts/STM.h | 10 +- rts/Schedule.c | 37 +- rts/StgCRun.c | 2 +- rts/StgMiscClosures.cmm | 133 ++- rts/StgStartup.cmm | 65 +- rts/StgStdThunks.cmm | 305 +++--- rts/Trace.c | 27 + rts/Trace.h | 10 + rts/Updates.cmm | 109 +- rts/Updates.h | 17 +- rts/eventlog/EventLog.c | 23 + rts/eventlog/EventLog.h | 2 + rts/ghc.mk | 19 +- rts/package.conf.in | 2 +- rts/posix/Itimer.c | 3 + rts/sm/Compact.c | 33 +- rts/sm/Evac.c | 13 +- rts/sm/GC.c | 30 +- rts/sm/GC.h | 8 +- rts/sm/Sanity.c | 41 +- rts/sm/Scav.c | 99 ++- rts/sm/Storage.c | 9 + rts/sm/Storage.h | 3 +- rules/build-dependencies.mk | 9 +- rules/build-package-data.mk | 15 +- rules/build-package-way.mk | 35 +- rules/build-package.mk | 11 + rules/build-prog.mk | 103 ++- rules/distdir-way-opts.mk | 12 + rules/haddock.mk | 6 +- rules/hs-suffix-rules-srcdir.mk | 6 + rules/{trace.mk => library-path.mk} | 16 +- rules/shell-wrapper.mk | 71 +- utils/compare_sizes/ghc.mk | 1 + utils/deriveConstants/DeriveConstants.hs | 866 ++++++++++++++ {driver/split => utils/deriveConstants}/Makefile | 4 +- {driver/split => utils/deriveConstants}/ghc.mk | 12 +- utils/genapply/GenApply.hs | 58 +- utils/genapply/ghc.mk | 1 + utils/genprimopcode/ghc.mk | 1 + utils/ghc-cabal/Main.hs | 152 ++- utils/ghc-cabal/ghc.mk | 1 + utils/ghc-pkg/Main.hs | 49 +- utils/ghc-pkg/ghc.mk | 15 +- utils/ghc-pwd/ghc.mk | 2 + utils/ghctags/Main.hs | 2 +- utils/ghctags/ghc.mk | 9 +- utils/ghctags/ghctags.cabal | 22 + utils/hp2ps/ghc.mk | 15 +- utils/hpc/ghc.mk | 11 +- utils/hpc/hpc-bin.cabal | 11 +- utils/mkUserGuidePart/ghc.mk | 9 +- .../mkUserGuidePart.cabal} | 8 +- utils/runghc/ghc.mk | 1 + utils/touchy/touchy.c | 138 ++- utils/unlit/ghc.mk | 1 + validate | 23 +- 403 files changed, 16391 insertions(+), 27779 deletions(-) Diff suppressed because of size. To see it, use: git show 39f55fbf760b38902af2698debfafe1479b37f53 _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
