Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : newcg
http://hackage.haskell.org/trac/ghc/changeset/ec2184eded032ec3305cc40c61149c4f8408ce49 >--------------------------------------------------------------- commit ec2184eded032ec3305cc40c61149c4f8408ce49 Merge: 3a47819... 4a0973b... Author: Simon Marlow <[email protected]> Date: Mon Feb 13 21:19:21 2012 +0000 Merge remote-tracking branch 'origin/master' into newcg Conflicts: compiler/cmm/CmmLint.hs compiler/cmm/OldCmm.hs compiler/codeGen/CgMonad.lhs compiler/main/CodeOutput.lhs .gitignore | 5 + aclocal.m4 | 114 +- compiler/basicTypes/DataCon.lhs | 93 +- compiler/basicTypes/MkId.lhs | 13 +- compiler/basicTypes/Name.lhs | 3 + compiler/basicTypes/OccName.lhs | 22 +- compiler/basicTypes/RdrName.lhs | 7 +- compiler/basicTypes/Var.lhs | 10 +- compiler/cmm/CmmCvt.hs | 4 +- compiler/cmm/CmmLint.hs | 25 - compiler/cmm/CmmOpt.hs | 6 +- compiler/cmm/CmmParse.y | 15 +- compiler/cmm/OldCmm.hs | 181 +- compiler/cmm/OldPprCmm.hs | 41 +- compiler/cmm/PprC.hs | 7 +- compiler/codeGen/CgBindery.lhs | 383 +- compiler/codeGen/CgCallConv.hs | 223 +- compiler/codeGen/CgCase.lhs | 526 +- compiler/codeGen/CgClosure.lhs | 10 +- compiler/codeGen/CgCon.lhs | 13 +- compiler/codeGen/CgExpr.lhs | 8 +- compiler/codeGen/CgForeignCall.hs | 20 +- compiler/codeGen/CgHeapery.lhs | 90 +- compiler/codeGen/CgInfoTbls.hs | 8 +- compiler/codeGen/CgMonad.lhs | 744 ++-- compiler/codeGen/CgPrimOp.hs | 175 +- compiler/codeGen/CgTailCall.lhs | 90 +- compiler/codeGen/CgUtils.hs | 2 +- compiler/codeGen/ClosureInfo.lhs | 12 +- compiler/codeGen/StgCmmForeign.hs | 2 +- compiler/codeGen/StgCmmMonad.hs | 4 +- compiler/codeGen/StgCmmPrim.hs | 24 +- compiler/coreSyn/CoreLint.lhs | 307 +- compiler/coreSyn/CorePrep.lhs | 2 +- compiler/coreSyn/CoreSyn.lhs | 22 +- compiler/coreSyn/CoreUtils.lhs | 67 +- compiler/coreSyn/MkCore.lhs | 24 +- compiler/coreSyn/PprCore.lhs | 3 + compiler/deSugar/Coverage.lhs | 7 +- compiler/deSugar/DsArrows.lhs | 238 +- compiler/deSugar/DsBinds.lhs | 74 +- compiler/deSugar/DsExpr.lhs | 10 +- compiler/deSugar/DsExpr.lhs-boot | 15 +- compiler/deSugar/DsForeign.lhs | 4 +- compiler/deSugar/DsListComp.lhs | 2 +- compiler/deSugar/DsMeta.hs | 16 +- compiler/deSugar/DsMonad.lhs | 14 +- compiler/deSugar/DsUtils.lhs | 2 +- compiler/deSugar/Match.lhs | 2 +- compiler/deSugar/Match.lhs-boot | 51 +- compiler/ghc.cabal.in | 9 +- compiler/ghc.mk | 14 +- compiler/ghci/Linker.lhs | 4 +- compiler/ghci/ObjLink.lhs | 38 +- compiler/ghci/RtClosureInspect.hs | 2 +- compiler/hsSyn/Convert.lhs | 40 +- compiler/hsSyn/HsDecls.lhs | 67 +- compiler/hsSyn/HsExpr.lhs | 19 +- compiler/hsSyn/HsExpr.lhs-boot | 19 +- compiler/hsSyn/HsImpExp.lhs | 8 +- compiler/hsSyn/HsTypes.lhs | 13 + compiler/hsSyn/HsUtils.lhs | 26 +- compiler/iface/BinIface.hs | 58 +- compiler/iface/BuildTyCl.lhs | 81 +- compiler/iface/FlagChecker.hs | 4 +- compiler/iface/IfaceSyn.lhs | 147 +- compiler/iface/LoadIface.lhs | 22 +- compiler/iface/MkIface.lhs | 147 +- compiler/iface/TcIface.lhs | 120 +- compiler/iface/TcIface.lhs-boot | 6 +- compiler/llvmGen/Llvm.hs | 9 +- compiler/llvmGen/Llvm/AbsSyn.hs | 40 +- compiler/llvmGen/Llvm/PpLlvm.hs | 138 +- compiler/llvmGen/Llvm/Types.hs | 44 +- compiler/llvmGen/LlvmCodeGen.hs | 6 +- compiler/llvmGen/LlvmCodeGen/Base.hs | 16 +- compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 125 +- compiler/llvmGen/LlvmCodeGen/Ppr.hs | 16 +- compiler/llvmGen/LlvmCodeGen/Regs.hs | 58 +- compiler/main/CmdLineParser.hs | 3 +- compiler/main/CodeOutput.lhs | 111 +- compiler/main/DriverPipeline.hs | 60 +- compiler/main/DynFlags.hs | 96 +- compiler/main/ErrUtils.lhs | 157 +- compiler/main/ErrUtils.lhs-boot | 4 +- compiler/main/Finder.lhs | 4 +- compiler/main/GHC.hs | 450 +- compiler/main/GhcMake.hs | 20 +- compiler/main/GhcMonad.hs | 9 +- compiler/main/HeaderInfo.hs | 2 +- compiler/main/HscMain.hs | 273 +- compiler/main/HscStats.lhs | 13 +- compiler/main/HscTypes.lhs | 99 +- compiler/main/InteractiveEval.hs | 114 +- compiler/main/Packages.lhs | 10 +- compiler/main/SysTools.lhs | 6 +- compiler/main/TidyPgm.lhs | 3 +- compiler/nativeGen/AsmCodeGen.lhs | 14 +- compiler/nativeGen/NCGMonad.hs | 14 +- compiler/nativeGen/PPC/CodeGen.hs | 27 +- compiler/nativeGen/SPARC/CodeGen.hs | 4 +- compiler/nativeGen/SPARC/CodeGen/CCall.hs | 4 +- compiler/nativeGen/SPARC/CodeGen/CondCode.hs | 4 +- compiler/nativeGen/SPARC/CodeGen/Gen32.hs-boot | 11 +- compiler/nativeGen/SPARC/CodeGen/Gen64.hs | 4 +- compiler/nativeGen/X86/CodeGen.hs | 37 +- compiler/parser/LexCore.hs | 54 +- compiler/parser/Lexer.x | 12 +- compiler/parser/Parser.y.pp | 111 +- compiler/parser/RdrHsSyn.lhs | 22 +- compiler/prelude/PrelNames.lhs | 74 +- compiler/prelude/PrelRules.lhs | 111 +- compiler/prelude/PrimOp.lhs | 163 +- compiler/prelude/TysWiredIn.lhs | 28 +- compiler/prelude/primops.txt.pp | 5 +- compiler/rename/RnEnv.lhs | 115 +- compiler/rename/RnExpr.lhs | 2 +- compiler/rename/RnExpr.lhs-boot | 19 +- compiler/rename/RnNames.lhs | 60 +- compiler/rename/RnPat.lhs | 2 +- compiler/rename/RnSource.lhs | 77 +- compiler/rename/RnTypes.lhs | 8 +- compiler/simplCore/CoreMonad.lhs | 8 +- compiler/simplCore/FloatIn.lhs | 121 +- compiler/simplCore/FloatOut.lhs | 20 +- compiler/simplCore/SetLevels.lhs | 4 +- compiler/simplCore/SimplEnv.lhs | 1 + compiler/simplCore/SimplMonad.lhs | 8 +- compiler/simplCore/SimplUtils.lhs | 4 +- compiler/simplCore/Simplify.lhs | 25 +- compiler/stgSyn/StgLint.lhs | 40 +- compiler/stgSyn/StgSyn.lhs | 591 ++-- compiler/stranal/DmdAnal.lhs | 17 +- compiler/typecheck/FamInst.lhs | 74 +- compiler/typecheck/Inst.lhs | 76 +- compiler/typecheck/TcArrows.lhs | 27 +- compiler/typecheck/TcBinds.lhs | 11 +- compiler/typecheck/TcCanonical.lhs | 336 +- compiler/typecheck/TcClassDcl.lhs | 2 +- compiler/typecheck/TcDeriv.lhs | 37 +- compiler/typecheck/TcEnv.lhs | 27 +- compiler/typecheck/TcErrors.lhs | 869 ++-- compiler/typecheck/TcEvidence.lhs | 64 +- compiler/typecheck/TcExpr.lhs | 13 +- compiler/typecheck/TcExpr.lhs-boot | 25 +- compiler/typecheck/TcForeign.lhs | 16 +- compiler/typecheck/TcGenDeriv.lhs | 7 +- compiler/typecheck/TcGenGenerics.lhs | 35 +- compiler/typecheck/TcHsSyn.lhs | 53 +- compiler/typecheck/TcHsType.lhs | 75 +- compiler/typecheck/TcInstDcls.lhs | 284 +- compiler/typecheck/TcInteract.lhs | 264 +- compiler/typecheck/TcMType.lhs | 20 +- compiler/typecheck/TcMatches.lhs | 23 +- compiler/typecheck/TcMatches.lhs-boot | 23 +- compiler/typecheck/TcPat.lhs | 3 + compiler/typecheck/TcRnDriver.lhs | 1299 +++--- compiler/typecheck/TcRnMonad.lhs | 177 +- compiler/typecheck/TcRnTypes.lhs | 213 +- compiler/typecheck/TcSMonad.lhs | 187 +- compiler/typecheck/TcSimplify.lhs | 140 +- compiler/typecheck/TcSimplify.lhs-old | 3297 ------------ compiler/typecheck/TcSplice.lhs | 47 +- compiler/typecheck/TcSplice.lhs-boot | 27 +- compiler/typecheck/TcTyClsDecls.lhs | 42 +- compiler/typecheck/TcType.lhs | 75 +- compiler/typecheck/TcUnify.lhs | 162 +- compiler/typecheck/TcUnify.lhs-boot | 7 - compiler/types/Class.lhs | 2 +- compiler/types/Coercion.lhs | 93 +- compiler/types/FamInstEnv.lhs | 302 +- compiler/types/FunDeps.lhs | 12 +- compiler/types/InstEnv.lhs | 74 +- compiler/types/Kind.lhs | 63 +- compiler/types/TyCon.lhs | 195 +- compiler/types/TyCon.lhs-boot | 15 +- compiler/types/TypeRep.lhs | 6 +- compiler/types/Unify.lhs | 6 +- compiler/utils/Binary.hs | 18 + compiler/utils/IOEnv.hs | 5 + compiler/utils/Outputable.lhs | 39 +- compiler/utils/Platform.hs | 38 +- compiler/utils/Util.lhs | 61 +- compiler/vectorise/Vectorise/Generic/PADict.hs | 7 +- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 49 +- compiler/vectorise/Vectorise/Generic/PData.hs | 59 +- compiler/vectorise/Vectorise/Monad.hs | 6 +- compiler/vectorise/Vectorise/Monad/InstEnv.hs | 3 +- compiler/vectorise/Vectorise/Monad/Naming.hs | 30 +- compiler/vectorise/Vectorise/Type/Classify.hs | 10 +- compiler/vectorise/Vectorise/Type/Env.hs | 55 +- compiler/vectorise/Vectorise/Type/TyConDecl.hs | 3 +- compiler/vectorise/Vectorise/Utils/Base.hs | 1 - compiler/vectorise/Vectorise/Utils/PADict.hs | 11 +- configure.ac | 135 +- distrib/MacOS/GHC.xcodeproj/project.pbxproj | 2 +- distrib/configure.ac.in | 23 +- distrib/mkDocs/mkDocs | 2 +- distrib/remilestoning.pl | 118 + docs/users_guide/7.6.1-notes.xml | 427 ++ docs/users_guide/bugs.xml | 92 + docs/users_guide/flags.xml | 5601 +++++++++++---------- docs/users_guide/glasgow_exts.xml | 37 +- docs/users_guide/intro.xml | 2 +- docs/users_guide/runtime_control.xml | 11 + docs/users_guide/safe_haskell.xml | 2 +- docs/users_guide/ug-ent.xml.in | 2 +- docs/users_guide/using.xml | 48 +- ghc.mk | 181 +- ghc/GhciMonad.hs | 85 +- ghc/InteractiveUI.hs | 747 ++-- ghc/Main.hs | 134 +- ghc/ghc-bin.cabal.in | 4 +- ghc/ghc.mk | 8 +- includes/Rts.h | 2 +- includes/ghc.mk | 30 +- includes/mkDerivedConstants.c | 26 +- includes/rts/Linker.h | 18 +- includes/rts/Threads.h | 4 - includes/rts/prof/CCS.h | 16 +- includes/rts/storage/GC.h | 8 +- includes/rts/storage/TSO.h | 2 +- includes/stg/Regs.h | 8 +- libffi/ghc.mk | 2 +- libraries/bin-package-db/bin-package-db.cabal | 2 +- libraries/gen_contents_index | 21 +- mk/build.mk.sample | 27 +- mk/config.mk.in | 63 +- mk/tree.mk | 2 +- mk/validate-settings.mk | 6 +- rts/Capability.c | 4 +- rts/Capability.h | 9 +- rts/Linker.c | 232 +- rts/LinkerInternals.h | 2 +- rts/PosixSource.h | 2 +- rts/PrimOps.cmm | 2 +- rts/RaiseAsync.c | 4 +- rts/RtsUtils.c | 2 +- rts/Schedule.c | 12 +- rts/Stats.c | 25 +- rts/StgCRun.c | 18 +- rts/Threads.c | 2 +- rts/Updates.cmm | 11 +- rts/ghc.mk | 4 +- rts/package.conf.in | 2 +- rts/posix/Itimer.c | 4 +- rts/posix/Select.c | 33 +- rts/posix/Signals.c | 28 +- rts/sm/GC.c | 42 + rts/sm/Sanity.c | 1 + rts/sm/Storage.c | 59 +- rules/build-package-data.mk | 4 +- rules/build-package.mk | 2 +- rules/cmm-suffix-rules.mk | 8 +- rules/haddock.mk | 2 +- rules/hs-suffix-rules-srcdir.mk | 4 +- rules/manual-package-config.mk | 4 +- rules/shell-wrapper.mk | 2 +- settings.in | 7 +- sync-all | 112 +- utils/genapply/ghc.mk | 6 +- utils/ghc-cabal/ghc-cabal.cabal | 4 +- utils/ghc-pkg/ghc.mk | 33 +- utils/ghctags/Main.hs | 2 +- utils/hp2ps/ghc.mk | 2 +- 265 files changed, 12601 insertions(+), 13478 deletions(-) Diff suppressed because of size. To see it, use: git show ec2184eded032ec3305cc40c61149c4f8408ce49 _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
