[commit: ghc] wip/T16212-fixed, wip/sgraf-no-exnstr: Revert "Batch merge" (172a593)

git at git.haskell.org git at git.haskell.org
Fri Feb 1 05:54:27 UTC 2019


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

On branches: wip/T16212-fixed,wip/sgraf-no-exnstr
Link       : http://ghc.haskell.org/trac/ghc/changeset/172a59335fa6c76b17fb6795e87fbc7fcfd198e6/ghc

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

commit 172a59335fa6c76b17fb6795e87fbc7fcfd198e6
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Jan 30 10:05:19 2019 -0500

    Revert "Batch merge"
    
    This reverts commit 76c8fd674435a652c75a96c85abbf26f1f221876.


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

172a59335fa6c76b17fb6795e87fbc7fcfd198e6
 .gitlab-ci.yml                                     |  54 +-----
 .gitlab/push-test-metrics.sh                       |  65 -------
 compiler/hieFile/HieAst.hs                         |  84 ++-------
 compiler/nativeGen/X86/CodeGen.hs                  |  83 +++------
 compiler/nativeGen/X86/Instr.hs                    |   6 -
 compiler/nativeGen/X86/Ppr.hs                      |   2 -
 compiler/parser/RdrHsSyn.hs                        |  41 ++---
 docs/users_guide/8.8.1-notes.rst                   |   4 -
 docs/users_guide/runtime_control.rst               |  28 +--
 docs/users_guide/separate_compilation.rst          |   5 -
 docs/users_guide/using.rst                         |  10 --
 hadrian/build.cabal.bat                            |   2 +-
 hadrian/build.cabal.sh                             |   2 +-
 hadrian/src/Settings/Flavours/Development.hs       |   5 +-
 includes/rts/Flags.h                               |  12 --
 libraries/base/Data/Bits.hs                        |   8 -
 libraries/base/GHC/Int.hs                          |  13 --
 libraries/base/GHC/RTS/Flags.hsc                   |   3 -
 libraries/base/GHC/Word.hs                         |  13 --
 libraries/base/tests/IO/T12010/test.T              |   3 +-
 libraries/base/tests/IO/all.T                      |   9 +-
 rts/Linker.c                                       |  90 +++++-----
 rts/LinkerInternals.h                              |   4 -
 rts/RtsFlags.c                                     |  11 --
 rts/linker/Elf.c                                   | 112 ++++++------
 rts/linker/Elf.h                                   |   2 +-
 rts/linker/MachO.c                                 |  40 ++---
 rts/linker/MachO.h                                 |   2 +-
 rts/linker/PEi386.c                                |   2 +-
 rts/linker/PEi386.h                                |   2 +-
 rts/linker/SymbolExtras.c                          |  84 ++++-----
 rts/linker/SymbolExtras.h                          |   2 +-
 rts/sm/OSMem.h                                     |  10 +-
 testsuite/driver/perf_notes.py                     | 200 +--------------------
 testsuite/driver/runtests.py                       |  36 +---
 testsuite/driver/testglobals.py                    |  12 +-
 testsuite/driver/testlib.py                        |  78 ++++----
 testsuite/driver/testutil.py                       |   2 +-
 .../tests/annotations/should_compile/th/all.T      |   4 +-
 testsuite/tests/cabal/T12485/all.T                 |   2 +-
 testsuite/tests/cabal/all.T                        |  33 ++--
 testsuite/tests/cmm/opt/all.T                      |   2 +-
 testsuite/tests/codeGen/should_compile/all.T       |  10 +-
 testsuite/tests/codeGen/should_run/T15038/all.T    |   3 +-
 testsuite/tests/deSugar/should_compile/all.T       |   7 +-
 testsuite/tests/dependent/should_compile/all.T     |   3 +-
 testsuite/tests/deriving/should_compile/all.T      |   5 +-
 testsuite/tests/deriving/should_fail/all.T         |   5 +-
 testsuite/tests/determinism/T13807/all.T           |   2 +-
 testsuite/tests/determinism/determ002/all.T        |   2 +-
 testsuite/tests/determinism/determ003/all.T        |   2 +-
 testsuite/tests/determinism/determ005/all.T        |   2 +-
 testsuite/tests/determinism/determ006/all.T        |   2 +-
 testsuite/tests/determinism/determ007/all.T        |   2 +-
 testsuite/tests/determinism/determ008/all.T        |   2 +-
 testsuite/tests/determinism/determ009/all.T        |   2 +-
 testsuite/tests/determinism/determ010/all.T        |   2 +-
 testsuite/tests/determinism/determ011/all.T        |   2 +-
 testsuite/tests/determinism/determ012/all.T        |   2 +-
 testsuite/tests/determinism/determ013/all.T        |   2 +-
 testsuite/tests/determinism/determ014/all.T        |   2 +-
 testsuite/tests/determinism/determ015/all.T        |   2 +-
 testsuite/tests/determinism/determ016/all.T        |   2 +-
 testsuite/tests/determinism/determ017/all.T        |   2 +-
 testsuite/tests/determinism/determ018/all.T        |   2 +-
 testsuite/tests/determinism/determ019/all.T        |   2 +-
 testsuite/tests/determinism/determ021/all.T        |   3 +-
 testsuite/tests/determinism/determ022/all.T        |   2 +-
 testsuite/tests/driver/T13392/all.T                |   2 +-
 testsuite/tests/driver/T13710/all.T                |   3 +-
 testsuite/tests/driver/T1372/all.T                 |   2 +-
 testsuite/tests/driver/T13803/all.T                |   3 +-
 testsuite/tests/driver/T13914/all.T                |   3 +-
 testsuite/tests/driver/T14075/all.T                |   3 +-
 testsuite/tests/driver/T15970/all.T                |   2 +-
 testsuite/tests/driver/T1959/test.T                |   2 +-
 testsuite/tests/driver/T3007/all.T                 |   3 +-
 testsuite/tests/driver/T437/all.T                  |   2 +-
 testsuite/tests/driver/T5147/all.T                 |   2 +-
 testsuite/tests/driver/T7373/all.T                 |   4 +-
 testsuite/tests/driver/T7835/all.T                 |   2 +-
 testsuite/tests/driver/T8184/all.T                 |   3 +-
 testsuite/tests/driver/T9562/all.T                 |   4 +-
 testsuite/tests/driver/all.T                       | 189 ++++++++++---------
 testsuite/tests/driver/bug1677/all.T               |   2 +-
 testsuite/tests/driver/conflicting_flags/test.T    |   3 +-
 testsuite/tests/driver/dynamicToo/all.T            |   4 +-
 .../tests/driver/dynamicToo/dynamicToo001/test.T   |   2 +-
 .../tests/driver/dynamicToo/dynamicToo002/test.T   |   4 +-
 .../tests/driver/dynamicToo/dynamicToo004/test.T   |   3 +-
 .../tests/driver/dynamicToo/dynamicToo005/test.T   |   4 +-
 testsuite/tests/driver/dynamic_flags_001/all.T     |   4 +-
 testsuite/tests/driver/linkwhole/all.T             |   2 +-
 testsuite/tests/driver/recomp001/all.T             |   4 +-
 testsuite/tests/driver/recomp002/all.T             |   4 +-
 testsuite/tests/driver/recomp003/all.T             |   3 +-
 testsuite/tests/driver/recomp004/all.T             |   3 +-
 testsuite/tests/driver/recomp005/all.T             |   7 +-
 testsuite/tests/driver/recomp006/all.T             |   4 +-
 testsuite/tests/driver/recomp007/all.T             |   4 +-
 testsuite/tests/driver/recomp008/all.T             |   7 +-
 testsuite/tests/driver/recomp009/all.T             |   2 +-
 testsuite/tests/driver/recomp010/all.T             |   2 +-
 testsuite/tests/driver/recomp011/all.T             |   2 +-
 testsuite/tests/driver/recomp012/all.T             |   2 +-
 testsuite/tests/driver/recomp013/all.T             |   2 +-
 testsuite/tests/driver/recomp015/all.T             |   3 +-
 testsuite/tests/driver/recomp016/all.T             |   4 +-
 testsuite/tests/driver/recomp017/all.T             |   2 +-
 testsuite/tests/driver/recomp018/all.T             |   2 +-
 testsuite/tests/driver/retc001/all.T               |   3 +-
 testsuite/tests/driver/retc002/all.T               |   4 +-
 testsuite/tests/driver/retc003/all.T               |   2 +-
 testsuite/tests/dynlibs/all.T                      |  12 +-
 testsuite/tests/ffi/should_run/all.T               |   8 +-
 testsuite/tests/gadt/all.T                         |   6 +-
 testsuite/tests/generics/all.T                     |   3 +-
 testsuite/tests/ghc-api/T10052/all.T               |   2 +-
 testsuite/tests/ghc-api/T4891/all.T                |   2 +-
 testsuite/tests/ghc-api/T7478/all.T                |   4 +-
 testsuite/tests/ghc-api/all.T                      |  10 +-
 testsuite/tests/ghc-api/annotations-literals/all.T |   4 +-
 testsuite/tests/ghc-api/annotations/T11018.stdout  |  11 +-
 testsuite/tests/ghc-api/annotations/T16212.stdout  |  35 +---
 testsuite/tests/ghc-api/annotations/Test16212.hs   |   2 -
 testsuite/tests/ghc-api/annotations/all.T          |  65 +++----
 testsuite/tests/ghc-api/apirecomp001/all.T         |   3 +-
 testsuite/tests/ghc-api/show-srcspan/all.T         |   2 +-
 testsuite/tests/ghc-e/should_fail/all.T            |  21 ++-
 testsuite/tests/ghc-e/should_run/all.T             |  29 +--
 testsuite/tests/ghci/linking/Makefile              |   5 -
 testsuite/tests/ghci/linking/T15729.c              |   4 -
 testsuite/tests/ghci/linking/T15729.hs             |  14 --
 testsuite/tests/ghci/linking/T15729.stdout         |   2 -
 testsuite/tests/ghci/linking/all.T                 |  28 +--
 testsuite/tests/ghci/linking/dyn/all.T             |  20 ++-
 testsuite/tests/ghci/prog004/prog004.T             |   3 +-
 testsuite/tests/ghci/scripts/all.T                 |  16 +-
 testsuite/tests/ghci/should_run/all.T              |   3 +-
 testsuite/tests/hp2ps/all.T                        |   2 +-
 testsuite/tests/hpc/all.T                          |   2 +-
 testsuite/tests/hsc2hs/all.T                       |  21 +--
 .../indexed-types/should_compile/T13092b/all.T     |   3 +-
 testsuite/tests/indexed-types/should_compile/all.T |  28 ++-
 .../tests/indexed-types/should_fail/T13092/all.T   |   2 +-
 .../tests/indexed-types/should_fail/T13092c/all.T  |   2 +-
 .../tests/indexed-types/should_fail/T13102/all.T   |   2 +-
 testsuite/tests/indexed-types/should_fail/all.T    |   9 +-
 testsuite/tests/layout/all.T                       |  19 +-
 testsuite/tests/lib/integer/all.T                  |   9 +-
 .../llvm/should_run/subsections_via_symbols/all.T  |   3 +-
 testsuite/tests/module/all.T                       |  18 +-
 testsuite/tests/module/base01/all.T                |   4 +-
 testsuite/tests/module/mod175/all.T                |   2 +-
 testsuite/tests/numeric/should_compile/all.T       |   6 +-
 testsuite/tests/numeric/should_run/all.T           |   2 +-
 testsuite/tests/parser/should_compile/T7476/all.T  |   2 +-
 testsuite/tests/patsyn/should_compile/T13350/all.T |   3 +-
 testsuite/tests/perf/compiler/all.T                |   5 +-
 testsuite/tests/perf/should_run/all.T              |   7 +-
 testsuite/tests/plugins/all.T                      |  46 ++---
 testsuite/tests/polykinds/all.T                    |  14 +-
 testsuite/tests/printer/all.T                      | 112 ++++++------
 testsuite/tests/profiling/should_compile/all.T     |   2 +-
 testsuite/tests/profiling/should_run/all.T         |   8 +-
 testsuite/tests/quasiquotation/all.T               |   6 +-
 testsuite/tests/rename/prog006/all.T               |   3 +-
 testsuite/tests/rename/should_compile/all.T        |  19 +-
 testsuite/tests/rename/should_fail/all.T           |   3 +-
 testsuite/tests/roles/should_fail/all.T            |   4 +-
 testsuite/tests/rts/T10672/all.T                   |   4 +-
 testsuite/tests/rts/T11223/all.T                   |  45 +++--
 testsuite/tests/rts/T12031/all.T                   |   2 +-
 testsuite/tests/rts/T12771/all.T                   |   2 +-
 testsuite/tests/rts/T13082/all.T                   |   4 +-
 testsuite/tests/rts/T14611/all.T                   |   2 +-
 testsuite/tests/rts/T15261/all.T                   |   4 +-
 testsuite/tests/rts/T15894/all.T                   |   2 +-
 testsuite/tests/rts/T8308/all.T                    |   3 +-
 testsuite/tests/rts/all.T                          |  61 ++++---
 testsuite/tests/runghc/all.T                       |  12 +-
 testsuite/tests/safeHaskell/safeLanguage/all.T     |   4 +-
 testsuite/tests/showIface/all.T                    |   8 +-
 .../tests/simplCore/should_compile/T16038/test.T   |   3 +-
 testsuite/tests/simplCore/should_compile/all.T     | 122 ++++++++-----
 testsuite/tests/stranal/should_compile/all.T       |   5 +-
 testsuite/tests/stranal/should_run/all.T           |   2 +-
 testsuite/tests/th/T2014/all.T                     |   4 +-
 testsuite/tests/th/TH_linker/all.T                 |   3 +-
 testsuite/tests/th/all.T                           |  20 ++-
 testsuite/tests/typecheck/T13168/all.T             |   3 +-
 testsuite/tests/typecheck/bug1465/all.T            |   2 +-
 testsuite/tests/typecheck/should_compile/all.T     |  29 +--
 testsuite/tests/typecheck/should_fail/all.T        |   2 +-
 testsuite/tests/unboxedsums/all.T                  |   3 +-
 testsuite/tests/utils/should_run/all.T             |   2 +-
 utils/ghc-pkg/Main.hs                              |   2 +-
 utils/hsc2hs                                       |   2 +-
 198 files changed, 1097 insertions(+), 1521 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 172a59335fa6c76b17fb6795e87fbc7fcfd198e6


More information about the ghc-commits mailing list