[commit: ghc] wip/T11295-part1: Merge branch 'master' into wip/T11295-part1 (a279e29)

git at git.haskell.org git at git.haskell.org
Wed May 16 21:26:52 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/T11295-part1
Link       : http://ghc.haskell.org/trac/ghc/changeset/a279e298f0797e86959476f29f82373dfb384437/ghc

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

commit a279e298f0797e86959476f29f82373dfb384437
Merge: 6bc2425 0c7db22
Author: Kavon Farvardin <kavon at farvard.in>
Date:   Wed May 16 16:04:04 2018 -0500

    Merge branch 'master' into wip/T11295-part1



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

a279e298f0797e86959476f29f82373dfb384437
 compiler/basicTypes/Literal.hs                     |  48 +-
 compiler/cmm/CLabel.hs                             |  55 +-
 compiler/cmm/Cmm.hs                                |  19 +-
 compiler/cmm/CmmBuildInfoTables.hs                 | 994 ++++++++++++++-------
 compiler/cmm/CmmCommonBlockElim.hs                 |   2 +-
 compiler/cmm/CmmExpr.hs                            |  11 +-
 compiler/cmm/CmmInfo.hs                            |  52 +-
 compiler/cmm/CmmParse.y                            |  12 +-
 compiler/cmm/CmmPipeline.hs                        |  21 +-
 compiler/cmm/CmmUtils.hs                           |   4 +-
 compiler/cmm/Hoopl/Dataflow.hs                     |   6 +
 compiler/cmm/PprC.hs                               |   6 +-
 compiler/cmm/PprCmm.hs                             |   2 +-
 compiler/cmm/PprCmmDecl.hs                         |  17 +-
 compiler/cmm/PprCmmExpr.hs                         |   2 +-
 compiler/codeGen/StgCmmBind.hs                     |  22 +-
 compiler/codeGen/StgCmmClosure.hs                  |  21 +-
 compiler/ghci/DebuggerUtils.hs                     |  20 +-
 compiler/ghci/RtClosureInspect.hs                  |   8 +-
 compiler/iface/IfaceEnv.hs                         |  83 +-
 compiler/iface/IfaceType.hs                        | 127 ++-
 compiler/iface/LoadIface.hs                        |   1 +
 compiler/llvmGen/Llvm/Types.hs                     |   4 +
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs            |  14 +-
 compiler/llvmGen/LlvmCodeGen/Data.hs               |   8 +-
 compiler/main/DynFlags.hs                          |   7 +
 compiler/main/HscMain.hs                           |  20 +-
 compiler/main/HscTypes.hs                          |  10 +-
 compiler/nativeGen/PIC.hs                          |  24 +-
 compiler/nativeGen/PPC/CodeGen.hs                  |   3 +-
 compiler/nativeGen/PPC/RegInfo.hs                  |   4 +-
 compiler/nativeGen/PPC/Regs.hs                     |   2 +-
 compiler/nativeGen/SPARC/Imm.hs                    |   2 +-
 compiler/nativeGen/SPARC/ShortcutJump.hs           |   4 +-
 compiler/nativeGen/X86/CodeGen.hs                  |   7 +-
 compiler/nativeGen/X86/Instr.hs                    |   4 +-
 compiler/nativeGen/X86/Ppr.hs                      |   2 +-
 compiler/nativeGen/X86/Regs.hs                     |   2 +-
 compiler/prelude/PrelRules.hs                      |  79 +-
 compiler/prelude/TysWiredIn.hs-boot                |   2 +
 compiler/simplCore/CoreMonad.hs                    |  24 +-
 compiler/stgSyn/CoreToStg.hs                       |   9 -
 compiler/typecheck/TcEnv.hs                        |  74 +-
 compiler/typecheck/TcErrors.hs                     |   8 +-
 compiler/typecheck/TcRnMonad.hs                    |  16 +-
 compiler/typecheck/TcValidity.hs                   |   5 +-
 compiler/utils/Outputable.hs                       |   5 +-
 includes/rts/storage/ClosureMacros.h               |   5 +-
 includes/rts/storage/InfoTables.h                  |  93 +-
 includes/stg/MiscClosures.h                        |  16 +
 libraries/base/GHC/Real.hs                         |  56 +-
 libraries/base/GHC/Weak.hs                         |   5 +-
 libraries/base/tests/T13167.hs                     |  29 +
 libraries/base/tests/T13167.stdout                 |   1 +
 libraries/base/tests/all.T                         |   2 +
 libraries/base/tests/enumNumeric.hs                |   7 +
 libraries/base/tests/enumNumeric.stdout            |   5 +
 libraries/ghci/GHCi/InfoTable.hsc                  |   8 +
 rts/RetainerProfile.c                              |   2 +-
 rts/RtsAPI.c                                       |   2 +-
 rts/RtsSymbols.c                                   |  16 +
 rts/StgMiscClosures.cmm                            |  55 +-
 rts/package.conf.in                                |  10 +
 rts/rts.cabal.in                                   |   6 +
 rts/sm/Compact.c                                   |   2 +-
 rts/sm/Evac.c                                      |   6 +-
 rts/sm/Sanity.c                                    |   2 +-
 rts/sm/Scav.c                                      | 113 +--
 .../tests/deSugar/should_compile/T2431.stderr      |   6 +-
 testsuite/tests/deriving/should_fail/T15073.hs     |   8 +
 testsuite/tests/deriving/should_fail/T15073.stderr |  22 +
 testsuite/tests/deriving/should_fail/T15073a.hs    |   5 +
 testsuite/tests/deriving/should_fail/all.T         |   2 +
 testsuite/tests/ghc-api/T4891/T4891.hs             |  15 +-
 testsuite/tests/numeric/should_run/T10962.hs       |  26 +-
 .../tests/numeric/should_run/T10962.stdout-ws-32   |   8 +-
 .../tests/numeric/should_run/T10962.stdout-ws-64   |   8 +-
 testsuite/tests/numeric/should_run/all.T           |   2 +-
 .../tests/partial-sigs/should_compile/T15039a.hs   |  41 +
 .../partial-sigs/should_compile/T15039a.stderr     |  55 ++
 .../tests/partial-sigs/should_compile/T15039b.hs   |  41 +
 .../partial-sigs/should_compile/T15039b.stderr     |  56 ++
 .../tests/partial-sigs/should_compile/T15039c.hs   |  41 +
 .../partial-sigs/should_compile/T15039c.stderr     |  55 ++
 .../tests/partial-sigs/should_compile/T15039d.hs   |  41 +
 .../partial-sigs/should_compile/T15039d.stderr     |  58 ++
 testsuite/tests/partial-sigs/should_compile/all.T  |   6 +-
 .../tests/patsyn/should_compile/T14394.stdout      |   2 +-
 testsuite/tests/perf/should_run/all.T              |   3 +-
 testsuite/tests/regalloc/regalloc_unit_tests.hs    |   2 +-
 .../tests/roles/should_compile/Roles13.stderr      |   2 +-
 .../tests/typecheck/should_compile/T13032.stderr   |   2 +-
 .../tests/typecheck/should_fail/T14390.stderr      |   2 +-
 93 files changed, 2025 insertions(+), 797 deletions(-)




More information about the ghc-commits mailing list