Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/b40f001f84aac224be0b18064dd1e2149b13f5f4 >--------------------------------------------------------------- commit b40f001f84aac224be0b18064dd1e2149b13f5f4 Merge: 6100eb4... 0125965... Author: Simon Peyton Jones <[email protected]> Date: Thu Apr 5 11:43:19 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/coreSyn/CoreLint.lhs | 12 +- compiler/coreSyn/TrieMap.lhs | 35 ++- compiler/deSugar/Desugar.lhs | 3 + compiler/iface/MkIface.lhs | 43 +- compiler/main/DynFlags.hs | 29 +- compiler/main/ErrUtils.lhs | 5 +- compiler/main/GHC.hs | 50 ++- compiler/main/HscMain.hs | 155 +++--- compiler/main/HscTypes.lhs | 17 +- compiler/rename/RnEnv.lhs | 4 +- compiler/typecheck/Inst.lhs | 52 ++- compiler/typecheck/TcCanonical.lhs | 871 ++++++++++++------------------ compiler/typecheck/TcDeriv.lhs | 12 +- compiler/typecheck/TcEnv.lhs | 36 +- compiler/typecheck/TcErrors.lhs | 60 ++- compiler/typecheck/TcHsType.lhs | 11 +- compiler/typecheck/TcInteract.lhs | 825 ++++++++++++++++------------- compiler/typecheck/TcMType.lhs | 23 +- compiler/typecheck/TcRnDriver.lhs | 26 +- compiler/typecheck/TcRnMonad.lhs | 9 + compiler/typecheck/TcRnTypes.lhs | 180 ++++--- compiler/typecheck/TcSMonad.lhs | 1058 +++++++++++++++++++---------------- compiler/typecheck/TcSimplify.lhs | 100 ++-- compiler/typecheck/TcUnify.lhs | 2 +- includes/rts/EventLogFormat.h | 27 +- includes/rts/storage/GC.h | 4 +- rts/Capability.c | 22 +- rts/Capability.h | 2 + rts/RtsFlags.c | 2 +- rts/RtsProbes.d | 36 +- rts/Schedule.c | 7 +- rts/Stats.c | 97 +++- rts/Stats.h | 8 +- rts/Trace.c | 98 ++++- rts/Trace.h | 245 ++++++++- rts/eventlog/EventLog.c | 196 +++++++- rts/eventlog/EventLog.h | 34 ++ rts/sm/GC.c | 25 +- rts/sm/Storage.c | 58 ++- rts/sm/Storage.h | 3 +- 40 files changed, 2645 insertions(+), 1837 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
