[commit: ghc] ghc-lwc2: Merging master (0209094)

Sivaramakrishnan Krishnamoorthy Chandrasekaran t-sichan at microsoft.com
Tue Apr 23 06:19:35 CEST 2013


Repository : http://darcs.haskell.org/ghc.git/

On branch  : ghc-lwc2

https://github.com/ghc/ghc/commit/02090942a38ac677759ddb9dea3e719b316614a0

>---------------------------------------------------------------

commit 02090942a38ac677759ddb9dea3e719b316614a0
Merge: 50e3b2e 2a7f4de
Author: KC Sivaramakrishnan <chandras at cs.purdue.edu>
Date:   Mon Apr 22 21:29:14 2013 -0400

    Merging master

 HACKING                                            |   63 -
 HACKING.md                                         |  149 +
 README.md                                          |   74 +-
 aclocal.m4                                         |   51 +-
 bindisttest/ghc.mk                                 |    2 +-
 boot                                               |    7 +-
 compiler/HsVersions.h                              |   10 -
 compiler/basicTypes/DataCon.lhs                    |    4 +
 compiler/basicTypes/Demand.lhs                     |   29 +-
 compiler/cmm/Bitmap.hs                             |   15 +-
 compiler/cmm/CLabel.hs                             |   51 +-
 compiler/cmm/Cmm.hs                                |    1 -
 compiler/cmm/CmmBuildInfoTables.hs                 |    8 +-
 compiler/cmm/CmmCallConv.hs                        |    8 +-
 compiler/cmm/CmmCommonBlockElim.hs                 |    5 -
 compiler/cmm/CmmContFlowOpt.hs                     |    3 +-
 compiler/cmm/CmmNode.hs                            |   51 +-
 compiler/cmm/CmmPipeline.hs                        |   16 +-
 compiler/cmm/CmmProcPoint.hs                       |    1 -
 compiler/cmm/CmmRewriteAssignments.hs              |    3 -
 compiler/cmm/CmmSink.hs                            |    2 +-
 compiler/cmm/CmmType.hs                            |    6 +
 compiler/cmm/CmmUtils.hs                           |   15 +-
 compiler/codeGen/StgCmmArgRep.hs                   |  135 +
 compiler/codeGen/StgCmmBind.hs                     |   43 +-
 compiler/codeGen/StgCmmClosure.hs                  |    5 +-
 compiler/codeGen/StgCmmEnv.hs                      |  139 +-
 compiler/codeGen/StgCmmExpr.hs                     |   10 +-
 compiler/codeGen/StgCmmForeign.hs                  |   53 +-
 compiler/codeGen/StgCmmHeap.hs                     |   91 +-
 compiler/codeGen/StgCmmLayout.hs                   |   84 +-
 compiler/codeGen/StgCmmMonad.hs                    |  330 +-
 compiler/codeGen/StgCmmPrim.hs                     |    2 +-
 compiler/codeGen/StgCmmTicky.hs                    |  664 ++-
 compiler/codeGen/StgCmmUtils.hs                    |    9 +-
 compiler/coreSyn/CorePrep.lhs                      |   74 +-
 compiler/coreSyn/CoreUnfold.lhs                    |   53 +-
 compiler/coreSyn/ExternalCore.lhs                  |    7 -
 compiler/deSugar/Coverage.lhs                      |    3 +
 compiler/deSugar/DsArrows.lhs                      |  484 ++-
 compiler/deSugar/DsBinds.lhs                       |   33 +-
 compiler/ghc.cabal.in                              |    4 +-
 compiler/ghc.mk                                    |  112 +-
 compiler/ghci/ByteCodeAsm.lhs                      |   18 +-
 compiler/ghci/ByteCodeItbls.lhs                    |  384 +-
 compiler/ghci/Linker.lhs                           |  115 +-
 compiler/ghci/RtClosureInspect.hs                  |    4 +-
 compiler/hsSyn/HsBinds.lhs                         |   85 +-
 compiler/hsSyn/HsExpr.lhs                          |   17 +-
 compiler/hsSyn/HsPat.lhs                           |   14 +-
 compiler/hsSyn/HsUtils.lhs                         |    7 +-
 compiler/iface/LoadIface.lhs                       |    9 +-
 compiler/iface/MkIface.lhs                         |    2 +-
 compiler/llvmGen/LlvmCodeGen/Ppr.hs                |    3 +
 compiler/main/CodeOutput.lhs                       |   25 +-
 compiler/main/DriverPipeline.hs                    |  677 +--
 compiler/main/DynFlags.hs                          |  161 +-
 compiler/main/GHC.hs                               |   12 +-
 compiler/main/GhcMake.hs                           |    8 +-
 compiler/main/HscMain.hs                           |  521 +--
 compiler/main/HscTypes.lhs                         |    2 +-
 compiler/main/InteractiveEval.hs                   |   56 +-
 compiler/main/InteractiveEval.hs-boot              |    3 -
 compiler/main/InteractiveEvalTypes.hs              |   65 +
 compiler/main/Packages.lhs                         |   12 +-
 compiler/main/PprTyThing.hs                        |    2 +-
 compiler/main/SysTools.lhs                         |    2 +
 compiler/nativeGen/AsmCodeGen.lhs                  |   81 +-
 compiler/nativeGen/PIC.hs                          |   45 +-
 compiler/nativeGen/PprBase.hs                      |   15 +-
 compiler/nativeGen/RegAlloc/Linear/Base.hs         |    2 +-
 .../nativeGen/RegAlloc/Linear/JoinToTargets.hs     |    2 +-
 compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs |    2 +-
 .../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs    |    2 +-
 compiler/nativeGen/RegAlloc/Liveness.hs            |    6 +-
 compiler/nativeGen/SPARC/AddrMode.hs               |   17 +-
 compiler/nativeGen/SPARC/CodeGen.hs                |    4 +-
 compiler/nativeGen/SPARC/CodeGen/Gen64.hs          |  158 +-
 compiler/parser/Lexer.x                            |    2 +-
 compiler/parser/Parser.y.pp                        |    4 +-
 compiler/parser/RdrHsSyn.lhs                       |    4 +-
 compiler/prelude/TysWiredIn.lhs                    |  270 +-
 compiler/rename/RnExpr.lhs                         |    4 +-
 compiler/rename/RnPat.lhs                          |   13 +-
 compiler/rename/RnTypes.lhs                        |    2 +-
 compiler/simplCore/CoreMonad.lhs                   |    4 +-
 compiler/simplCore/OccurAnal.lhs                   |   73 +-
 compiler/simplCore/SimplCore.lhs                   |   15 +-
 compiler/specialise/SpecConstr.lhs                 |   66 +-
 compiler/stgSyn/CoreToStg.lhs                      |   11 +-
 compiler/stranal/WwLib.lhs                         |   24 +-
 compiler/typecheck/TcArrows.lhs                    |  272 +-
 compiler/typecheck/TcCanonical.lhs                 |  211 +-
 compiler/typecheck/TcDeriv.lhs                     |   99 +-
 compiler/typecheck/TcErrors.lhs                    |   47 +-
 compiler/typecheck/TcHsSyn.lhs                     |    6 +-
 compiler/typecheck/TcHsType.lhs                    |    2 +-
 compiler/typecheck/TcInstDcls.lhs                  |    2 +-
 compiler/typecheck/TcInteract.lhs                  |    1 +
 compiler/typecheck/TcMType.lhs                     |   21 +-
 compiler/typecheck/TcRnDriver.lhs                  |   75 +-
 compiler/typecheck/TcRnMonad.lhs                   |    2 +-
 compiler/typecheck/TcRnTypes.lhs                   |   63 +-
 compiler/typecheck/TcRules.lhs                     |    4 +-
 compiler/typecheck/TcSMonad.lhs                    |    5 +-
 compiler/typecheck/TcSimplify.lhs                  |   78 +-
 compiler/typecheck/TcTyClsDecls.lhs                |  533 ++-
 compiler/typecheck/TcTyDecls.lhs                   |   23 +-
 compiler/typecheck/TcType.lhs                      |    2 +-
 compiler/typecheck/TcValidity.lhs                  |   73 +-
 compiler/types/FamInstEnv.lhs                      |   14 +-
 compiler/types/InstEnv.lhs                         |   13 +-
 compiler/types/Kind.lhs                            |    9 +-
 compiler/types/Type.lhs                            |  426 +-
 compiler/utils/FastMutInt.lhs                      |   16 +-
 compiler/utils/FastString.lhs                      |    2 -
 compiler/utils/Fingerprint.hsc                     |    1 +
 compiler/utils/IOEnv.hs                            |   20 -
 compiler/utils/Maybes.lhs                          |   11 +-
 compiler/utils/OrdList.lhs                         |    9 +-
 compiler/utils/Outputable.lhs                      |    5 +-
 compiler/utils/Platform.hs                         |   17 +-
 compiler/utils/Stream.hs                           |    4 +-
 compiler/utils/UniqSet.lhs                         |   11 +-
 compiler/utils/Util.lhs                            |    9 +-
 configure.ac                                       |   23 +-
 distrib/compare/Utils.hs                           |    4 +
 distrib/compare/compare.hs                         |    3 +-
 distrib/configure.ac.in                            |    1 +
 distrib/ghc.iss.in                                 |   97 -
 distrib/windows-installer-licences.txt             |  704 ----
 docs/comm/rts-libs/prelude.html                    |    4 +-
 docs/users_guide/extending_ghc.xml                 |    4 +-
 docs/users_guide/external_core.xml                 |    5 +-
 docs/users_guide/flags.xml                         |   20 +-
 docs/users_guide/ghc.mk                            |    4 +-
 docs/users_guide/ghci.xml                          |   18 +-
 docs/users_guide/glasgow_exts.xml                  |  120 +-
 docs/users_guide/profiling.xml                     |  172 +-
 driver/ghc/ghc.mk                                  |    4 +-
 driver/ghci/ghc.mk                                 |   10 +-
 driver/haddock/ghc.mk                              |    4 +-
 driver/split/ghc.mk                                |    5 +-
 ghc.mk                                             |  466 +--
 ghc/InteractiveUI.hs                               |   23 +-
 ghc/Main.hs                                        |   51 +-
 ghc/ghc.mk                                         |   30 +-
 includes/Cmm.h                                     |   43 +-
 includes/ghc.mk                                    |   10 +-
 includes/rts/Ticky.h                               |    2 +-
 includes/rts/prof/CCS.h                            |    2 +-
 includes/rts/storage/ClosureMacros.h               |    4 -
 includes/stg/Ticky.h                               |   51 +-
 .../Distribution/InstalledPackageInfo/Binary.hs    |    6 -
 libraries/bin-package-db/bin-package-db.cabal      |    9 +-
 mk/build.mk.sample                                 |    2 +-
 mk/config.mk.in                                    |  217 +-
 mk/project.mk.in                                   |   18 +-
 mk/tree.mk                                         |   19 -
 mk/validate-settings.mk                            |    6 +-
 mk/ways.mk                                         |    4 +-
 packages                                           |   91 +-
 rts/Adjustor.c                                     |    6 +-
 rts/AutoApply.h                                    |    6 +-
 rts/Exception.cmm                                  |   10 +-
 rts/LdvProfile.c                                   |    2 +-
 rts/Linker.c                                       |   78 +-
 rts/ProfHeap.c                                     |    5 +-
 rts/STM.c                                          |    8 +-
 rts/StgCRun.c                                      |   10 +-
 rts/Ticky.c                                        |  128 +-
 rts/VisCallbacks.c                                 |   75 -
 rts/VisCallbacks.h                                 |   30 -
 rts/VisSupport.c                                   |  144 -
 rts/VisSupport.h                                   |   44 -
 rts/VisWindow.c                                    |  747 ----
 rts/VisWindow.h                                    |    5 -
 rts/ghc.mk                                         |   76 +-
 rts/package.conf.in                                |    2 +-
 rts/parallel/0Hash.c                               |  320 --
 rts/parallel/0Parallel.h                           |  414 --
 rts/parallel/0Unpack.c                             |  440 --
 rts/parallel/Dist.c                                |  117 -
 rts/parallel/Dist.h                                |   20 -
 rts/parallel/FetchMe.h                             |   24 -
 rts/parallel/FetchMe.hc                            |  180 -
 rts/parallel/Global.c                              | 1090 -----
 rts/parallel/GranSim.c                             | 3015 --------------
 rts/parallel/GranSimRts.h                          |  268 --
 rts/parallel/HLC.h                                 |   63 -
 rts/parallel/HLComms.c                             | 1817 ---------
 rts/parallel/LLC.h                                 |  130 -
 rts/parallel/LLComms.c                             |  489 ---
 rts/parallel/PEOpCodes.h                           |   58 -
 rts/parallel/Pack.c                                | 4293 --------------------
 rts/parallel/ParInit.c                             |  322 --
 rts/parallel/ParInit.h                             |   19 -
 rts/parallel/ParTicky.c                            |  450 --
 rts/parallel/ParTicky.h                            |   60 -
 rts/parallel/ParTypes.h                            |   38 -
 rts/parallel/Parallel.c                            | 1140 ------
 rts/parallel/ParallelDebug.c                       | 1955 ---------
 rts/parallel/ParallelDebug.h                       |   79 -
 rts/parallel/ParallelRts.h                         |  253 --
 rts/parallel/RBH.c                                 |  337 --
 rts/parallel/SysMan.c                              |  650 ---
 rts/posix/Itimer.c                                 |   55 +-
 rts/sm/Storage.c                                   |    4 +-
 rules/build-dependencies.mk                        |    6 +-
 rules/build-package-data.mk                        |   19 +-
 rules/build-package-way.mk                         |   67 +-
 rules/build-perl.mk                                |   35 +-
 rules/build-prog.mk                                |   76 +-
 rules/c-suffix-rules.mk                            |   12 +-
 rules/cmm-suffix-rules.mk                          |   12 +-
 rules/distdir-opts.mk                              |   13 +-
 rules/distdir-way-opts.mk                          |   17 +-
 rules/extra-packages.mk                            |   48 -
 rules/foreachLibrary.mk                            |   43 +
 rules/haddock.mk                                   |    9 +-
 rules/hs-suffix-rules-srcdir.mk                    |    4 +-
 rules/hs-suffix-way-rules-srcdir.mk                |   33 +-
 rules/hs-suffix-way-rules.mk                       |    8 +-
 rules/library-path.mk                              |    6 +-
 rules/manual-package-config.mk                     |    4 +-
 rules/package-config.mk                            |    4 +-
 rules/pretty_commands.mk                           |    2 +-
 rules/shell-wrapper.mk                             |    8 +-
 settings.in                                        |    1 +
 sync-all                                           |  398 +-
 utils/compare_sizes/ghc.mk                         |    2 +-
 utils/count_lines/ghc.mk                           |    2 +-
 utils/deriveConstants/DeriveConstants.hs           |    1 +
 utils/deriveConstants/ghc.mk                       |    2 +-
 utils/dll-split/Main.hs                            |   85 +
 .../ghctags.cabal => dll-split/dll-split.cabal}    |    7 +-
 {driver/split => utils/dll-split}/ghc.mk           |   13 +-
 utils/genapply/ghc.mk                              |    2 +-
 utils/genprimopcode/ghc.mk                         |    2 +-
 utils/ghc-cabal/Main.hs                            |   73 +-
 utils/ghc-cabal/ghc.mk                             |   38 +-
 utils/ghc-pkg/ghc.mk                               |   10 +-
 utils/ghc-pwd/ghc.mk                               |    2 +-
 utils/ghctags/Main.hs                              |    9 +-
 utils/ghctags/ghc.mk                               |    2 +-
 utils/hp2ps/ghc.mk                                 |    2 +-
 utils/hpc/ghc.mk                                   |    2 +-
 utils/ltx/Makefile                                 |   12 -
 utils/ltx/ltx.prl                                  |  229 --
 utils/mkUserGuidePart/ghc.mk                       |    2 +-
 utils/parallel/AVG.pl                              |  108 -
 utils/parallel/GrAnSim.el                          |  432 --
 utils/parallel/Makefile                            |   53 -
 utils/parallel/RTS2gran.pl                         |  684 ----
 utils/parallel/SN.pl                               |  280 --
 utils/parallel/SPLIT.pl                            |  379 --
 utils/parallel/avg-RTS.pl                          |   15 -
 utils/parallel/get_SN.pl                           |   40 -
 utils/parallel/ghc-fool-sort.pl                    |   23 -
 utils/parallel/ghc-unfool-sort.pl                  |   16 -
 utils/parallel/gp-ext-imp.pl                       |   86 -
 utils/parallel/gr2RTS.pl                           |  138 -
 utils/parallel/gr2ap.bash                          |  124 -
 utils/parallel/gr2gran.bash                        |  113 -
 utils/parallel/gr2java.pl                          |  322 --
 utils/parallel/gr2jv.bash                          |  123 -
 utils/parallel/gr2pe.pl                            | 1434 -------
 utils/parallel/gr2ps.bash                          |  169 -
 utils/parallel/gr2qp.pl                            |  329 --
 utils/parallel/gran-extr.pl                        | 2114 ----------
 utils/parallel/grs2gr.pl                           |   48 -
 utils/parallel/par-aux.pl                          |   89 -
 utils/parallel/ps-scale-y.pl                       |  188 -
 utils/parallel/qp2ap.pl                            |  495 ---
 utils/parallel/qp2ps.pl                            |  988 -----
 utils/parallel/sn_filter.pl                        |   92 -
 utils/parallel/stats.pl                            |  168 -
 utils/parallel/template.pl                         |  141 -
 utils/parallel/tf.pl                               |  148 -
 utils/runghc/ghc.mk                                |    6 +-
 utils/stat2resid/Makefile                          |   41 -
 utils/stat2resid/parse-gcstats.prl                 |  232 --
 utils/stat2resid/prefix.txt                        |   10 -
 utils/stat2resid/process-gcstats.prl               |   45 -
 utils/stat2resid/stat2resid.prl                    |   81 -
 utils/touchy/ghc.mk                                |    2 +-
 utils/unlit/ghc.mk                                 |    2 +-
 utils/verbatim/Makefile                            |   17 -
 utils/verbatim/verbatim.lex                        |   63 -
 289 files changed, 5766 insertions(+), 35151 deletions(-)

diff --cc packages
index 60e4815,7f8a8ab..46cadc5
--- a/packages
+++ b/packages
@@@ -40,47 -39,46 +39,47 @@@
  #
  # Lines that start with a '#' are comments.
  #
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- #    localpath                tag           remotepath                          VCS
- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ghc-tarballs                    -           ghc-tarballs.git                    git
- utils/hsc2hs                    -           hsc2hs.git                          git
- utils/haddock                   -           haddock.git                         git
- libraries/array                 -           packages/array.git                  git
- libraries/base                  -           packages/base.git                   git
- libraries/binary                -           -                                   git
- libraries/bytestring            -           -                                   git
- libraries/Cabal                 -           -                                   git
- libraries/containers            -           -                                   git
- libraries/deepseq               -           packages/deepseq.git                git
- libraries/directory             -           packages/directory.git              git
- libraries/filepath              -           packages/filepath.git               git
- libraries/ghc-prim              -           packages/ghc-prim.git               git
- libraries/haskeline             -           -                                   git
- libraries/haskell98             -           packages/haskell98.git              git
- libraries/haskell2010           -           packages/haskell2010.git            git
- libraries/hoopl                 -           packages/hoopl.git                  git
- libraries/hpc                   -           packages/hpc.git                    git
- libraries/integer-gmp           -           packages/integer-gmp.git            git
- libraries/integer-simple        -           packages/integer-simple.git         git
- libraries/lwconc                -           packages/lwconc.git                 git
- libraries/old-locale            -           packages/old-locale.git             git
- libraries/old-time              -           packages/old-time.git               git
- libraries/pretty                -           -                                   git
- libraries/process               -           packages/process.git                git
- libraries/template-haskell      -           packages/template-haskell.git       git
- libraries/terminfo              -           -                                   git
- libraries/time                  -           -                                   git
- libraries/transformers          -           -                                   git
- libraries/unix                  -           packages/unix.git                   git
- libraries/Win32                 -           -                                   git
- libraries/xhtml                 -           -                                   git
- testsuite                       testsuite   testsuite.git                       git
- nofib                           nofib       nofib.git                           git
- libraries/parallel              extra       packages/parallel.git               git
- libraries/stm                   extra       packages/stm.git                    git
- libraries/random                dph         -                                   git
- libraries/primitive             dph         -                                   git
- libraries/vector                dph         -                                   git
- libraries/dph                   dph         packages/dph.git                    git
- .                               -           ghc.git                             git
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ #    localpath                tag           remotepath
+ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ghc-tarballs                    -           ghc-tarballs.git
+ utils/hsc2hs                    -           hsc2hs.git
+ utils/haddock                   -           haddock.git
+ libraries/array                 -           packages/array.git
+ libraries/base                  -           packages/base.git
+ libraries/binary                -           -
+ libraries/bytestring            -           -
+ libraries/Cabal                 -           -
+ libraries/containers            -           -
+ libraries/deepseq               -           packages/deepseq.git
+ libraries/directory             -           packages/directory.git
+ libraries/filepath              -           packages/filepath.git
+ libraries/ghc-prim              -           packages/ghc-prim.git
+ libraries/haskeline             -           -
+ libraries/haskell98             -           packages/haskell98.git
+ libraries/haskell2010           -           packages/haskell2010.git
+ libraries/hoopl                 -           packages/hoopl.git
+ libraries/hpc                   -           packages/hpc.git
+ libraries/integer-gmp           -           packages/integer-gmp.git
+ libraries/integer-simple        -           packages/integer-simple.git
++libraries/lwconc                -           packages/lwconc.git
+ libraries/old-locale            -           packages/old-locale.git
+ libraries/old-time              -           packages/old-time.git
+ libraries/pretty                -           -
+ libraries/process               -           packages/process.git
+ libraries/template-haskell      -           packages/template-haskell.git
+ libraries/terminfo              -           -
+ libraries/time                  -           -
+ libraries/transformers          -           -
+ libraries/unix                  -           packages/unix.git
+ libraries/Win32                 -           -
+ libraries/xhtml                 -           -
+ testsuite                       testsuite   testsuite.git
+ nofib                           nofib       nofib.git
+ libraries/parallel              extra       packages/parallel.git
+ libraries/stm                   extra       packages/stm.git
+ libraries/random                dph         -
+ libraries/primitive             dph         -
+ libraries/vector                dph         -
+ libraries/dph                   dph         packages/dph.git
+ .                               -           ghc.git
diff --cc rts/sm/Storage.c
index 1fa22a0,5c4e54f..c15ad6f
--- a/rts/sm/Storage.c
+++ b/rts/sm/Storage.c
@@@ -638,9 -638,9 +638,9 @@@ allocate (Capability *cap, W_ n
      bdescr *bd;
      StgPtr p;
  
-     TICK_ALLOC_HEAP_NOCTR(n);
+     TICK_ALLOC_HEAP_NOCTR(WDS(n));
      CCS_ALLOC(cap->r.rCCCS,n);
 -    
 +
      if (n >= LARGE_OBJECT_THRESHOLD/sizeof(W_)) {
          W_ req_blocks =  (W_)BLOCK_ROUND_UP(n*sizeof(W_)) / BLOCK_SIZE;
  





More information about the ghc-commits mailing list