[commit: ghc] wip/14691: Merge remote-tracking branch 'origin/master' into wip/14691 (73ed13e)

[git at git.haskell.org]

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

On branch  : wip/14691
Link       : http://ghc.haskell.org/trac/ghc/changeset/73ed13ed36e5a8e3fe29b9c349dfc292bed66a98/ghc

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

commit 73ed13ed36e5a8e3fe29b9c349dfc292bed66a98
Merge: dc6de0a 0636689
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Jan 25 21:38:59 2018 -0500

    Merge remote-tracking branch 'origin/master' into wip/14691



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

73ed13ed36e5a8e3fe29b9c349dfc292bed66a98
 compiler/cmm/CmmMachOp.hs                          |   2 +
 compiler/cmm/CmmParse.y                            |  10 ++
 compiler/cmm/Hoopl/Dataflow.hs                     |  34 ++---
 compiler/cmm/PprC.hs                               |   2 +
 compiler/codeGen/StgCmmPrim.hs                     |  28 ++++
 compiler/coreSyn/CoreOpt.hs                        |   6 +-
 compiler/coreSyn/CoreUnfold.hs                     |   9 +-
 compiler/coreSyn/CoreUtils.hs                      | 102 ++++++++++----
 compiler/coreSyn/MkCore.hs                         |   1 -
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs            |  97 ++++++++++---
 compiler/main/DriverPipeline.hs                    |   2 +
 compiler/main/DynFlags.hs                          |  29 ++++
 compiler/main/SysTools/Info.hs                     |   4 +
 compiler/nativeGen/CPrim.hs                        |  20 +++
 compiler/nativeGen/PPC/CodeGen.hs                  |   2 +
 compiler/nativeGen/SPARC/CodeGen.hs                |   2 +
 compiler/nativeGen/X86/CodeGen.hs                  |  69 +++++++++
 compiler/nativeGen/X86/Instr.hs                    |   9 ++
 compiler/nativeGen/X86/Ppr.hs                      |  13 ++
 compiler/parser/Lexer.x                            | 101 ++++++++------
 compiler/prelude/primops.txt.pp                    |  22 +++
 compiler/typecheck/TcGenDeriv.hs                   |   2 +-
 compiler/typecheck/TcRnTypes.hs                    |  18 ++-
 compiler/typecheck/TcSimplify.hs                   |  21 +--
 compiler/typecheck/TcType.hs                       |  31 +++--
 compiler/types/Coercion.hs                         |  11 +-
 compiler/types/TyCoRep.hs                          |  51 +++++--
 compiler/utils/StringBuffer.hs                     |   1 +
 compiler/utils/Util.hs                             |  21 ++-
 docs/users_guide/glasgow_exts.rst                  | 154 +++++++++++++++++++--
 libraries/Cabal                                    |   2 +-
 libraries/base/GHC/Stack/Types.hs                  |  23 +--
 libraries/base/base.cabal                          |   2 +-
 .../ghc-boot-th/GHC/LanguageExtensions/Type.hs     |   1 +
 libraries/ghc-prim/cbits/pdep.c                    |  48 +++++++
 libraries/ghc-prim/cbits/pext.c                    |  44 ++++++
 libraries/ghc-prim/ghc-prim.cabal                  |   4 +-
 libraries/transformers                             |   2 +-
 rts/Stats.c                                        |   5 +-
 rts/sm/Evac.c                                      |   7 +-
 rts/sm/GC.c                                        |   4 +
 rts/sm/GC.h                                        |   2 +-
 rts/sm/Storage.c                                   |   4 -
 .../backpack/cabal/bkpcabal06/bkpcabal06.cabal     |   2 +-
 testsuite/tests/cabal/ghcpkg01.stdout              |  39 +-----
 testsuite/tests/codeGen/should_run/all.T           |   2 +
 testsuite/tests/codeGen/should_run/cgrun075.hs     | 115 +++++++++++++++
 .../{cgrun071.stdout => cgrun075.stdout}           |   0
 testsuite/tests/codeGen/should_run/cgrun076.hs     | 115 +++++++++++++++
 .../{cgrun071.stdout => cgrun076.stdout}           |   0
 .../deriving/should_compile/drv-empty-data.stderr  |   2 +-
 testsuite/tests/driver/T4437.hs                    |   3 +-
 .../parser/should_fail/NoNumericUnderscores0.hs    |  12 ++
 .../should_fail/NoNumericUnderscores0.stderr       |   3 +
 .../parser/should_fail/NoNumericUnderscores1.hs    |  12 ++
 .../should_fail/NoNumericUnderscores1.stderr       |   3 +
 .../parser/should_fail/NumericUnderscoresFail0.hs  |  13 ++
 .../should_fail/NumericUnderscoresFail0.stderr     |   4 +
 .../parser/should_fail/NumericUnderscoresFail1.hs  |  20 +++
 .../should_fail/NumericUnderscoresFail1.stderr     |   7 +
 testsuite/tests/parser/should_fail/all.T           |   7 +
 .../tests/parser/should_run/NumericUnderscores0.hs | 101 ++++++++++++++
 .../parser/should_run/NumericUnderscores0.stdout   |  13 ++
 .../tests/parser/should_run/NumericUnderscores1.hs |  88 ++++++++++++
 .../parser/should_run/NumericUnderscores1.stdout   |  14 ++
 testsuite/tests/parser/should_run/all.T            |   2 +
 testsuite/tests/patsyn/should_fail/T14507.stderr   |   2 +-
 testsuite/tests/patsyn/should_fail/all.T           |   2 +-
 testsuite/tests/perf/compiler/all.T                |  15 +-
 testsuite/tests/perf/compiler/genManyAlternatives  |  34 +++++
 testsuite/tests/plugins/Makefile                   |   5 +
 testsuite/tests/plugins/all.T                      |   6 +
 testsuite/tests/rebindable/T14670.hs               |  11 ++
 testsuite/tests/rebindable/all.T                   |   1 +
 utils/ghc-cabal/Main.hs                            |   6 +-
 75 files changed, 1424 insertions(+), 257 deletions(-)