[commit: ghc] wip/shnajd-TTG-SrcLocs: Merge branch 'master' of git://github.com/ghc/ghc into wip/shnajd-TTG-SrcLocs (869d99b)

git at git.haskell.org git at git.haskell.org
Sat Nov 10 09:20:38 UTC 2018


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

On branch  : wip/shnajd-TTG-SrcLocs
Link       : http://ghc.haskell.org/trac/ghc/changeset/869d99bcc8ef4aa69dfb79825e4ee73af96cab62/ghc

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

commit 869d99bcc8ef4aa69dfb79825e4ee73af96cab62
Merge: 6be401f 63a8170
Author: Shayan-Najd <sh.najd at gmail.com>
Date:   Thu Nov 8 22:12:48 2018 +0000

    Merge branch 'master' of git://github.com/ghc/ghc into wip/shnajd-TTG-SrcLocs



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

869d99bcc8ef4aa69dfb79825e4ee73af96cab62
 .circleci/config.yml                            |   43 +-
 .circleci/push-test-metrics.sh                  |   46 +
 compiler/codeGen/StgCmmPrim.hs                  |    6 +-
 compiler/llvmGen/Llvm/Types.hs                  |    2 +-
 compiler/llvmGen/LlvmCodeGen/Base.hs            |  115 +--
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs         |   64 +-
 compiler/typecheck/TcSplice.hs                  |   23 +-
 compiler/types/Coercion.hs                      |   18 +-
 compiler/types/FamInstEnv.hs                    |    8 +-
 compiler/types/TyCon.hs                         |    6 +-
 compiler/types/Type.hs                          |   39 +
 libraries/base/tests/all.T                      |   18 +-
 libraries/directory                             |    2 +-
 libraries/integer-gmp/changelog.md              |    2 +-
 llvm-passes                                     |    2 +-
 testsuite/driver/README.md                      |  133 +++
 testsuite/driver/perf_notes.py                  |  382 ++++++++
 testsuite/driver/runtests.py                    |   71 +-
 testsuite/driver/testglobals.py                 |   33 +-
 testsuite/driver/testlib.py                     |  228 +++--
 testsuite/driver/testutil.py                    |   18 +
 testsuite/mk/test.mk                            |   12 +
 testsuite/tests/callarity/perf/all.T            |   12 +-
 testsuite/tests/codeGen/should_run/all.T        |    3 +-
 testsuite/tests/dependent/should_fail/T15859.hs |   13 +
 testsuite/tests/deriving/perf/all.T             |   11 +-
 testsuite/tests/perf/compiler/all.T             | 1056 ++---------------------
 testsuite/tests/perf/haddock/all.T              |  184 +---
 testsuite/tests/perf/join_points/all.T          |   16 +-
 testsuite/tests/perf/should_run/all.T           |  374 ++------
 testsuite/tests/perf/space_leaks/all.T          |   75 +-
 testsuite/tests/pmcheck/should_compile/all.T    |   27 +-
 testsuite/tests/primops/should_run/all.T        |    6 +-
 testsuite/tests/simplCore/should_compile/all.T  |    3 +-
 testsuite/tests/simplStg/should_run/all.T       |    5 +-
 testsuite/tests/th/T15845.hs                    |   17 +
 testsuite/tests/th/T15845.stderr                |    5 +
 testsuite/tests/th/T9692.stderr                 |    3 +-
 testsuite/tests/th/all.T                        |    1 +
 39 files changed, 1187 insertions(+), 1895 deletions(-)



More information about the ghc-commits mailing list