Repository : ssh://[email protected]/ghc On branch : ghc-parmake-gsoc Link : http://ghc.haskell.org/trac/ghc/changeset/26bf3dd478dce53eb50c2ce13821d61e416e3fe7/ghc
>--------------------------------------------------------------- commit 26bf3dd478dce53eb50c2ce13821d61e416e3fe7 Merge: 6d755c0 85c1715 Author: Patrick Palka <[email protected]> Date: Fri Aug 30 12:54:22 2013 -0400 Merge branch 'master' into ghc-parmake-gsoc Conflicts: compiler/main/DynFlags.hs compiler/utils/FastString.lhs >--------------------------------------------------------------- 26bf3dd478dce53eb50c2ce13821d61e416e3fe7 aclocal.m4 | 2 + compiler/basicTypes/BasicTypes.lhs | 9 +- compiler/cmm/CmmExpr.hs | 6 +- compiler/codeGen/StgCmm.hs | 7 +- compiler/codeGen/StgCmmBind.hs | 16 +- compiler/codeGen/StgCmmClosure.hs | 147 +++++--- compiler/codeGen/StgCmmExpr.hs | 111 +++++- compiler/codeGen/StgCmmMonad.hs | 121 ++++--- compiler/coreSyn/CoreSubst.lhs | 27 +- compiler/coreSyn/CoreSyn.lhs | 14 +- compiler/coreSyn/CoreTidy.lhs | 7 +- compiler/coreSyn/CoreUnfold.lhs | 6 +- compiler/coreSyn/CoreUtils.lhs | 48 +-- compiler/coreSyn/PprCore.lhs | 2 +- compiler/deSugar/DsMeta.hs | 16 + compiler/hsSyn/HsBinds.lhs | 127 ++++--- compiler/hsSyn/HsExpr.lhs | 60 +-- compiler/iface/BinIface.hs | 2 - compiler/iface/IfaceSyn.lhs | 35 +- compiler/iface/MkIface.lhs | 7 +- compiler/iface/TcIface.lhs | 74 ++-- compiler/main/DriverPipeline.hs | 87 +++-- compiler/main/DynFlags.hs | 22 +- compiler/main/GhcMake.hs | 2 +- compiler/main/GhcMonad.hs | 8 + compiler/main/Packages.lhs | 17 +- compiler/main/SysTools.lhs | 17 +- compiler/main/TidyPgm.lhs | 5 - compiler/rename/RnNames.lhs | 9 +- compiler/rename/RnPat.lhs | 228 ++++++------ compiler/simplCore/OccurAnal.lhs | 4 +- compiler/simplCore/SimplCore.lhs | 11 +- compiler/simplCore/Simplify.lhs | 8 +- compiler/specialise/SpecConstr.lhs | 2 +- compiler/stranal/WorkWrap.lhs | 32 +- compiler/typecheck/TcDeriv.lhs | 2 +- compiler/typecheck/TcErrors.lhs | 77 ++-- compiler/typecheck/TcRnTypes.lhs | 5 +- compiler/typecheck/TcSimplify.lhs | 85 +++-- compiler/typecheck/TcTyClsDecls.lhs | 4 +- compiler/types/CoAxiom.lhs | 8 +- compiler/types/InstEnv.lhs | 55 ++- compiler/types/Unify.lhs | 26 +- docs/users_guide/7.8.1-notes.xml | 98 ++++- docs/users_guide/flags.xml | 77 +++- docs/users_guide/ghci.xml | 17 +- docs/users_guide/glasgow_exts.xml | 68 +++- docs/users_guide/phases.xml | 32 +- docs/users_guide/separate_compilation.xml | 35 +- docs/users_guide/using.xml | 564 ++++++++++++++++------------- ghc/InteractiveUI.hs | 20 +- libraries/Cabal | 2 +- libraries/binary | 2 +- libraries/bytestring | 2 +- libraries/containers | 2 +- rts/posix/OSMem.c | 21 ++ settings.in | 1 + sync-all | 22 ++ 58 files changed, 1584 insertions(+), 937 deletions(-) diff --cc compiler/main/DynFlags.hs index 89ba319,e80cf65..37b016b --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@@ -579,10 -582,8 +582,12 @@@ data DynFlags = DynFlags ruleCheck :: Maybe String, strictnessBefore :: [Int], -- ^ Additional demand analysis + parUpsweepNum :: Maybe Int, -- ^ The number of modules to compile in parallel + -- during the upsweep, where Nothing ==> compile as + -- many in parallel as there are CPUs. + + maxRelevantBinds :: Maybe Int, -- ^ Maximum number of bindings from the type envt + -- to show in type error messages simplTickFactor :: Int, -- ^ Multiplier for simplifier ticks specConstrThreshold :: Maybe Int, -- ^ Threshold for SpecConstr specConstrCount :: Maybe Int, -- ^ Max number of specialisations for any one function _______________________________________________ ghc-commits mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-commits
