[commit: ghc] wip/docker-ghcci: Merge branch 'master' of git://git.haskell.org/ghc into wip/docker-ghcci (3650f09)

[git at git.haskell.org]

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

On branch  : wip/docker-ghcci
Link       : http://ghc.haskell.org/trac/ghc/changeset/3650f0983e4c2b5f97d669fcb16b06bca1045429/ghc

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

commit 3650f0983e4c2b5f97d669fcb16b06bca1045429
Merge: ad9b64d b2996f1
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Feb 27 10:27:28 2018 -0500

    Merge branch 'master' of git://git.haskell.org/ghc into wip/docker-ghcci



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

3650f0983e4c2b5f97d669fcb16b06bca1045429
 .circleci/config.yml                               |  36 +-
 .gitignore                                         |   2 +
 aclocal.m4                                         |  13 +-
 boot                                               |  11 +
 compiler/cmm/CmmCommonBlockElim.hs                 |  11 +-
 compiler/cmm/CmmExpr.hs                            |  13 +-
 compiler/cmm/CmmLayoutStack.hs                     |  16 +-
 compiler/cmm/CmmSink.hs                            |   2 +-
 compiler/cmm/CmmUtils.hs                           |  18 +
 compiler/codeGen/CgUtils.hs                        |   2 +-
 compiler/codeGen/StgCmmBind.hs                     |  11 +-
 compiler/codeGen/StgCmmCon.hs                      |   4 +-
 compiler/codeGen/StgCmmForeign.hs                  |  47 +--
 compiler/codeGen/StgCmmHeap.hs                     |   9 +-
 compiler/codeGen/StgCmmLayout.hs                   |   3 +-
 compiler/codeGen/StgCmmPrim.hs                     |  21 +-
 compiler/codeGen/StgCmmProf.hs                     |  15 +-
 compiler/codeGen/StgCmmUtils.hs                    |   2 +-
 compiler/coreSyn/CoreLint.hs                       |   5 +-
 compiler/coreSyn/CoreUtils.hs                      |   2 +
 compiler/deSugar/DsForeign.hs                      |   3 +-
 compiler/iface/FlagChecker.hs                      |   3 +-
 compiler/main/DriverPipeline.hs                    |  26 +-
 compiler/main/DynFlags.hs                          |  74 +++-
 compiler/main/ErrUtils.hs                          |   9 +-
 compiler/prelude/PrelRules.hs                      |  13 +
 compiler/prelude/primops.txt.pp                    |   1 -
 compiler/rename/RnSource.hs                        |   5 +-
 compiler/simplStg/SimplStg.hs                      |  12 +-
 compiler/simplStg/UnariseStg.hs                    |  60 ++-
 compiler/stgSyn/StgLint.hs                         | 459 +++++++--------------
 compiler/stgSyn/StgSyn.hs                          |   1 +
 compiler/typecheck/TcDeriv.hs                      |  59 ++-
 compiler/typecheck/TcDerivUtils.hs                 |  10 +-
 compiler/typecheck/TcErrors.hs                     | 290 +++++++++----
 compiler/typecheck/TcHsType.hs                     |  13 +-
 compiler/typecheck/TcRnTypes.hs                    |  16 +-
 compiler/typecheck/TcTypeable.hs                   |   5 +-
 compiler/types/Unify.hs                            | 106 +++--
 configure.ac                                       |   2 +
 docs/users_guide/8.2.1-notes.rst                   |   2 +-
 docs/users_guide/8.6.1-notes.rst                   |   3 +
 docs/users_guide/debugging.rst                     |  11 +-
 docs/users_guide/glasgow_exts.rst                  | 116 +++++-
 docs/users_guide/phases.rst                        |   5 +-
 driver/utils/dynwrapper.c                          |   1 -
 hadrian                                            |   2 +-
 libraries/base/Data/Typeable/Internal.hs           |  14 +-
 libraries/base/changelog.md                        |   5 +-
 libraries/filepath                                 |   2 +-
 libraries/ghc-prim/.gitignore                      |   1 +
 libraries/haskeline                                |   2 +-
 libraries/parsec                                   |   2 +-
 libraries/pretty                                   |   2 +-
 libraries/primitive                                |   2 +-
 libraries/process                                  |   2 +-
 libraries/stm                                      |   2 +-
 libraries/text                                     |   2 +-
 mk/config.mk.in                                    |   1 +
 rts/PrimOps.cmm                                    |   5 -
 rts/RetainerProfile.c                              |   9 -
 rts/RetainerSet.c                                  | 141 -------
 rts/RetainerSet.h                                  |  23 +-
 rts/RtsSymbols.c                                   |   1 -
 rts/win32/IOManager.c                              |  15 +-
 rules/build-package-way.mk                         |   7 +-
 rules/haddock.mk                                   |   1 +
 .../concurrent/should_run/setnumcapabilities001.hs |   2 +-
 testsuite/tests/deriving/should_fail/T14728a.hs    |  20 +
 .../tests/deriving/should_fail/T14728a.stderr      |   7 +
 testsuite/tests/deriving/should_fail/T14728b.hs    |  16 +
 .../tests/deriving/should_fail/T14728b.stderr      |   7 +
 testsuite/tests/deriving/should_fail/all.T         |   2 +
 testsuite/tests/gadt/T14808.hs                     |  12 +
 testsuite/tests/gadt/all.T                         |   1 +
 testsuite/tests/perf/compiler/all.T                |  10 +-
 testsuite/tests/polykinds/T14846.hs                |  39 ++
 testsuite/tests/polykinds/T14846.stderr            |  43 ++
 testsuite/tests/polykinds/all.T                    |   1 +
 testsuite/tests/th/T13123.hs                       |   2 -
 testsuite/tests/typecheck/should_compile/T14811.hs |   5 +
 .../abstract_refinement_substitutions.hs           |   7 +
 .../abstract_refinement_substitutions.stderr       | 290 +++++++++++++
 testsuite/tests/typecheck/should_compile/all.T     |   3 +
 .../should_compile/refinement_substitutions.hs     |   7 +
 .../should_compile/refinement_substitutions.stderr | 188 +++++++++
 .../tests/typecheck/should_fail/T13075.stderr      |   3 +
 testsuite/tests/typecheck/should_fail/T14761a.hs   |   3 +
 .../tests/typecheck/should_fail/T14761a.stderr     |   7 +
 testsuite/tests/typecheck/should_fail/T14761b.hs   |   5 +
 .../tests/typecheck/should_fail/T14761b.stderr     |   7 +
 testsuite/tests/typecheck/should_fail/T7210.stderr |   1 +
 testsuite/tests/typecheck/should_fail/all.T        |   4 +-
 utils/ghc-cabal/ghc.mk                             |   2 +-
 utils/haddock                                      |   2 +-
 95 files changed, 1683 insertions(+), 802 deletions(-)