Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/9500b166d07e5a6ef7717f30ab89bb3e36eb77ea >--------------------------------------------------------------- commit 9500b166d07e5a6ef7717f30ab89bb3e36eb77ea Merge: 5c9dfad... c555564... Author: Simon Peyton Jones <[email protected]> Date: Thu Jul 21 17:22:47 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc Makefile | 4 +- compiler/basicTypes/BasicTypes.lhs | 39 +- compiler/basicTypes/Id.lhs | 4 +- compiler/basicTypes/IdInfo.lhs | 2 +- compiler/basicTypes/VarEnv.lhs | 2 +- compiler/coreSyn/CoreFVs.lhs | 17 +- compiler/coreSyn/CoreLint.lhs | 2 +- compiler/coreSyn/CoreSubst.lhs | 8 +- compiler/coreSyn/CoreUtils.lhs | 4 +- compiler/deSugar/Desugar.lhs | 10 +- compiler/deSugar/DsBinds.lhs | 7 +- compiler/ghci/ByteCodeGen.lhs | 5 +- compiler/hsSyn/Convert.lhs | 4 - compiler/hsSyn/HsDecls.lhs | 5 +- compiler/iface/BinIface.hs | 14 +- compiler/iface/IfaceSyn.lhs | 2 +- compiler/iface/LoadIface.lhs | 1 + compiler/iface/MkIface.lhs | 68 ++-- compiler/iface/TcIface.lhs | 4 +- compiler/llvmGen/LlvmMangler.hs | 121 ++++-- compiler/main/DriverPipeline.hs | 24 +- compiler/main/ErrUtils.lhs | 1 - compiler/main/GHC.hs | 7 + compiler/main/GhcMake.hs | 23 +- compiler/main/HscMain.lhs | 92 +++-- compiler/main/HscTypes.lhs | 33 ++- compiler/main/TidyPgm.lhs | 2 +- compiler/nativeGen/X86/CodeGen.hs | 682 +++++++++++++++-------------- compiler/rename/RnBinds.lhs | 9 +- compiler/rename/RnEnv.lhs | 43 ++- compiler/rename/RnPat.lhs | 57 ++- compiler/rename/RnSource.lhs | 16 +- compiler/rename/RnTypes.lhs | 45 +- compiler/simplCore/CoreMonad.lhs | 80 ++-- compiler/simplCore/OccurAnal.lhs | 790 +++++++++++++++++++--------------- compiler/simplCore/SimplCore.lhs | 24 +- compiler/simplCore/SimplEnv.lhs | 2 +- compiler/simplCore/SimplUtils.lhs | 39 ++- compiler/simplCore/Simplify.lhs | 11 +- compiler/specialise/Specialise.lhs | 3 + compiler/typecheck/TcEnv.lhs | 2 - compiler/typecheck/TcInstDcls.lhs | 414 +++++++++--------- compiler/typecheck/TcRnDriver.lhs | 5 +- compiler/typecheck/TcRnMonad.lhs | 9 +- compiler/typecheck/TcRnTypes.lhs | 5 + compiler/typecheck/TcSplice.lhs | 2 + compiler/vectorise/Vectorise.hs | 5 +- compiler/vectorise/Vectorise/Exp.hs | 4 +- docs/users_guide/glasgow_exts.xml | 33 ++- ghc/InteractiveUI.hs | 24 +- ghc/Main.hs | 3 + includes/rts/storage/ClosureMacros.h | 4 +- includes/stg/SMP.h | 2 +- mk/build.mk.sample | 23 + rts/Adjustor.c | 17 +- rts/RetainerProfile.c | 10 + rts/RtsProbes.d | 4 +- rts/Schedule.c | 9 +- rts/WSDeque.c | 2 +- rts/sm/GC.c | 12 + rts/sm/GC.h | 4 +- sync-all | 247 ++++++----- 62 files changed, 1783 insertions(+), 1363 deletions(-) diff --cc compiler/simplCore/CoreMonad.lhs index 1cdfe1b,7a0f41e..41ecb01 --- a/compiler/simplCore/CoreMonad.lhs +++ b/compiler/simplCore/CoreMonad.lhs @@@ -11,8 -11,10 +11,8 @@@ module CoreMonad CoreToDo(..), runWhen, runMaybe, SimplifierMode(..), FloatOutSwitches(..), - dumpSimplPhase, + dumpSimplPhase, pprPassDetails, - defaultGentleSimplToDo, - -- * Plugins PluginPass, Plugin(..), CommandLineOption, defaultPlugin, bindsOnlyPass, _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
