[commit: ghc] wip/kavon-nosplit-llvm: Merge branch 'master' into no-split (ed3cb56)

[git at git.haskell.org]

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

On branch  : wip/kavon-nosplit-llvm
Link       : http://ghc.haskell.org/trac/ghc/changeset/ed3cb561a8a2f81e54602a55be05ae5991777c25/ghc

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

commit ed3cb561a8a2f81e54602a55be05ae5991777c25
Merge: 7338422 239418c
Author: Kavon Farvardin <kavon at farvard.in>
Date:   Wed May 3 17:18:09 2017 +0100

    Merge branch 'master' into no-split
    
    catching up to master 239418cf94dede0f116bb859d1bb95891235eb76



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

ed3cb561a8a2f81e54602a55be05ae5991777c25
 compiler/basicTypes/OccName.hs                     |  23 +-
 compiler/codeGen/StgCmmPrim.hs                     |   6 +-
 compiler/coreSyn/CoreLint.hs                       |   4 +-
 compiler/coreSyn/CoreSubst.hs                      |   2 +-
 compiler/coreSyn/CoreSyn.hs                        |   3 +-
 compiler/coreSyn/CoreTidy.hs                       |   8 +-
 compiler/deSugar/Check.hs                          |   2 +-
 compiler/deSugar/DsArrows.hs                       |   4 +-
 compiler/deSugar/DsExpr.hs                         | 262 ++++++---
 compiler/deSugar/DsMonad.hs                        |   3 +-
 compiler/hsSyn/HsExpr.hs                           |   3 +
 compiler/hsSyn/HsUtils.hs                          |   7 +-
 compiler/llvmGen/LlvmCodeGen/Ppr.hs                |  72 ++-
 compiler/llvmGen/LlvmMangler.hs                    |  11 +-
 compiler/main/TidyPgm.hs                           |   5 +-
 compiler/nativeGen/PPC/CodeGen.hs                  |   8 +
 compiler/nativeGen/PPC/Instr.hs                    |   3 +
 compiler/nativeGen/PPC/Ppr.hs                      |   1 +
 compiler/rename/RnEnv.hs                           |   2 +-
 compiler/simplCore/SetLevels.hs                    |  39 +-
 compiler/simplCore/SimplEnv.hs                     | 237 ++++----
 compiler/simplCore/SimplMonad.hs                   |  20 +-
 compiler/simplCore/SimplUtils.hs                   | 125 ++--
 compiler/simplCore/Simplify.hs                     | 627 +++++++++++----------
 compiler/simplStg/StgCse.hs                        |   2 +-
 compiler/specialise/SpecConstr.hs                  | 315 +++++++----
 compiler/typecheck/TcAnnotations.hs                |  25 +-
 compiler/typecheck/TcBinds.hs                      |   2 +-
 compiler/typecheck/TcCanonical.hs                  |  98 +---
 compiler/typecheck/TcExpr.hs                       |  20 +-
 compiler/typecheck/TcFlatten.hs                    |  88 ++-
 compiler/typecheck/TcMatches.hs                    |   4 +-
 compiler/typecheck/TcRnTypes.hs                    |  21 +-
 compiler/typecheck/TcSMonad.hs                     |   1 +
 compiler/typecheck/TcSplice.hs                     |   4 +-
 compiler/types/Kind.hs                             |  40 --
 compiler/types/TyCoRep.hs                          |   4 +-
 compiler/types/Type.hs                             | 146 ++---
 compiler/types/Type.hs-boot                        |   3 +-
 configure.ac                                       |   2 +-
 docs/users_guide/glasgow_exts.rst                  |   2 +-
 libraries/array                                    |   2 +-
 libraries/base/System/IO.hs                        |  20 +-
 mk/warnings.mk                                     |   4 +-
 rts/Linker.c                                       |  56 +-
 rts/linker/Elf.c                                   | 166 +++++-
 rts/linker/Elf.h                                   |   4 +
 rts/linker/LoadArchive.c                           |   5 +
 testsuite/tests/codeGen/should_compile/T13233.hs   |  12 -
 testsuite/tests/codeGen/should_compile/all.T       |   1 -
 testsuite/tests/codeGen/should_fail/T13233.hs      |  27 +
 testsuite/tests/codeGen/should_fail/T13233.stderr  |  24 +
 testsuite/tests/codeGen/should_fail/all.T          |   1 +
 testsuite/tests/perf/compiler/all.T                |  21 +-
 testsuite/tests/perf/should_run/T13623.hs          |  82 +++
 testsuite/tests/perf/should_run/T13623.stdout      |   1 +
 testsuite/tests/perf/should_run/all.T              |   8 +
 .../tests/simplCore/should_compile/T12603.stdout   |   2 +-
 .../tests/simplCore/should_compile/T3234.stderr    |  10 +-
 testsuite/tests/stage1/T13609.hs                   |   5 +
 testsuite/tests/stage1/T13609.stderr               |   3 +
 testsuite/tests/stage1/all.T                       |   1 +
 testsuite/tests/typecheck/should_compile/Makefile  |   6 +
 testsuite/tests/typecheck/should_compile/T13333.hs |  28 +
 testsuite/tests/typecheck/should_compile/T13585.hs |   5 +
 .../tests/typecheck/should_compile/T13585a.hs      |  81 +++
 .../tests/typecheck/should_compile/T13585b.hs      |   7 +
 testsuite/tests/typecheck/should_compile/all.T     |   2 +
 .../tests/typecheck/should_fail/T10619.stderr      |   4 +-
 69 files changed, 1815 insertions(+), 1027 deletions(-)