[commit: ghc] tc-untouchables: Merge remote-tracking branch 'origin/master' into tc-untouchables (8e7d415)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : tc-untouchables http://hackage.haskell.org/trac/ghc/changeset/8e7d41525dd6360eb828b14b2c1c764ed5023916 >--------------------------------------------------------------- commit 8e7d41525dd6360eb828b14b2c1c764ed5023916 Merge: 9429190... 16cc37f... Author: Simon Peyton Jones <[email protected]> Date: Tue Sep 18 17:40:23 2012 +0100 Merge remote-tracking branch 'origin/master' into tc-untouchables compiler/basicTypes/Literal.lhs | 45 ++-- compiler/basicTypes/MkId.lhs | 11 +- compiler/cmm/CLabel.hs | 6 +- compiler/cmm/CmmPipeline.hs | 2 +- compiler/cmm/CmmType.hs | 27 +-- compiler/codeGen/CgProf.hs | 4 +- compiler/codeGen/CgTicky.hs | 11 +- compiler/codeGen/StgCmmProf.hs | 5 +- compiler/codeGen/StgCmmTicky.hs | 7 +- compiler/coreSyn/CorePrep.lhs | 12 +- compiler/coreSyn/CoreSyn.lhs | 19 +- compiler/coreSyn/CoreUtils.lhs | 7 +- compiler/coreSyn/MkCore.lhs | 17 +- compiler/deSugar/DsCCall.lhs | 15 +- compiler/deSugar/DsForeign.lhs | 2 +- compiler/deSugar/DsMeta.hs | 19 +- compiler/deSugar/DsUtils.lhs | 7 +- compiler/deSugar/Match.lhs | 31 ++-- compiler/deSugar/MatchCon.lhs | 6 +- compiler/deSugar/MatchLit.lhs | 43 ++-- compiler/ghc.mk | 6 +- compiler/ghci/DebuggerUtils.hs | 1 - compiler/ghci/Linker.lhs | 2 +- compiler/main/Constants.lhs | 27 ++- compiler/main/DynFlags.hs | 21 ++ compiler/main/TidyPgm.lhs | 40 ++-- compiler/prelude/PrelRules.lhs | 354 ++++++++++++++++------------ compiler/simplCore/FloatIn.lhs | 105 +++++---- compiler/simplCore/SimplCore.lhs | 4 +- compiler/simplCore/Simplify.lhs | 14 +- compiler/specialise/Rules.lhs | 29 ++- compiler/specialise/Specialise.lhs | 9 +- compiler/typecheck/Inst.lhs | 19 +- compiler/typecheck/TcHsSyn.lhs | 16 +- compiler/typecheck/TcTyClsDecls.lhs | 34 ++-- compiler/vectorise/Vectorise/Exp.hs | 8 +- compiler/vectorise/Vectorise/Type/Env.hs | 6 +- compiler/vectorise/Vectorise/Utils/Base.hs | 5 +- includes/HaskellConstants.hs | 58 ----- rts/sm/GC.c | 14 +- 40 files changed, 574 insertions(+), 494 deletions(-)