[commit: ghc] master: Restore Trees That Grow reverted commits (1aa1d40)

Mon Apr 9 19:29:48 UTC 2018

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1aa1d405d8212a99ac24dcfd48024a17c3ffd296/ghc

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

commit 1aa1d405d8212a99ac24dcfd48024a17c3ffd296
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Sun Apr 1 21:33:53 2018 +0200

    Restore Trees That Grow reverted commits

    The following commits were reverted prior to the release of GHC 8.4.1,
    because the time to derive Data instances was too long [1].

     438dd1cbba13d35f3452b4dcef3f94ce9a216905 Phab:D4147
     e3ec2e7ae94524ebd111963faf34b84d942265b4 Phab:D4177
     47ad6578ea460999b53eb4293c3a3b3017a56d65 Phab:D4186

    The work is continuing, as the minimum bootstrap compiler is now
    GHC 8.2.1, and this allows Plan B[2] for instances to be used.  This
    will land in a following commit.

    Updates Haddock submodule

    [1] https://ghc.haskell.org/trac/ghc/wiki/ImplementingTreesThatGrow/Instances
    [2] https://ghc.haskell.org/trac/ghc/wiki/ImplementingTreesThatGrow/Instances#PLANB

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

1aa1d405d8212a99ac24dcfd48024a17c3ffd296
 compiler/deSugar/Check.hs                          |  61 +-
 compiler/deSugar/Coverage.hs                       | 214 +++---
 compiler/deSugar/DsArrows.hs                       |  80 ++-
 compiler/deSugar/DsExpr.hs                         | 124 ++--
 compiler/deSugar/DsGRHSs.hs                        |  15 +-
 compiler/deSugar/DsListComp.hs                     |  20 +-
 compiler/deSugar/DsMeta.hs                         | 194 +++---
 compiler/deSugar/DsUtils.hs                        |  63 +-
 compiler/deSugar/Match.hs                          | 107 +--
 compiler/deSugar/MatchLit.hs                       |  35 +-
 compiler/deSugar/PmExpr.hs                         |  39 +-
 compiler/hsSyn/Convert.hs                          | 257 ++++----
 compiler/hsSyn/HsBinds.hs                          |  71 +-
 compiler/hsSyn/HsDecls.hs                          |  65 +-
 compiler/hsSyn/HsExpr.hs                           | 724 ++++++++++++++-------
 compiler/hsSyn/HsExpr.hs-boot                      |  14 +-
 compiler/hsSyn/HsExtension.hs                      | 499 ++++++++++++--
 compiler/hsSyn/HsLit.hs                            |  64 +-
 compiler/hsSyn/HsPat.hs                            | 283 +++++---
 compiler/hsSyn/HsPat.hs-boot                       |   4 +-
 compiler/hsSyn/HsSyn.hs                            |   2 +-
 compiler/hsSyn/HsTypes.hs                          | 414 ++++++++----
 compiler/hsSyn/HsUtils.hs                          | 372 ++++++-----
 compiler/hsSyn/PlaceHolder.hs                      |  21 +-
 compiler/main/HscStats.hs                          |   2 +-
 compiler/main/InteractiveEval.hs                   |   5 +-
 compiler/parser/Parser.y                           | 255 ++++----
 compiler/parser/RdrHsSyn.hs                        | 275 ++++----
 compiler/rename/RnBinds.hs                         |  14 +-
 compiler/rename/RnEnv.hs                           |   4 +-
 compiler/rename/RnExpr.hs                          | 321 ++++-----
 compiler/rename/RnFixity.hs                        |   5 +-
 compiler/rename/RnNames.hs                         |   8 +-
 compiler/rename/RnPat.hs                           | 101 +--
 compiler/rename/RnSource.hs                        |  29 +-
 compiler/rename/RnSplice.hs                        | 101 +--
 compiler/rename/RnSplice.hs-boot                   |   4 +-
 compiler/rename/RnTypes.hs                         | 337 +++++-----
 compiler/typecheck/Inst.hs                         |  22 +-
 compiler/typecheck/TcArrows.hs                     |  53 +-
 compiler/typecheck/TcBinds.hs                      |  14 +-
 compiler/typecheck/TcDeriv.hs                      |   3 +-
 compiler/typecheck/TcExpr.hs                       | 245 +++----
 compiler/typecheck/TcGenDeriv.hs                   |  25 +-
 compiler/typecheck/TcGenFunctor.hs                 |   1 +
 compiler/typecheck/TcHsSyn.hs                      | 335 +++++-----
 compiler/typecheck/TcHsType.hs                     |  82 +--
 compiler/typecheck/TcInstDcls.hs                   |  17 +-
 compiler/typecheck/TcMatches.hs                    |  21 +-
 compiler/typecheck/TcPat.hs                        |  81 +--
 compiler/typecheck/TcPatSyn.hs                     | 114 ++--
 compiler/typecheck/TcRnDriver.hs                   |  39 +-
 compiler/typecheck/TcRnTypes.hs                    |  91 ++-
 compiler/typecheck/TcSplice.hs                     |  29 +-
 compiler/typecheck/TcTyClsDecls.hs                 |  17 +-
 compiler/typecheck/TcTyDecls.hs                    |  15 +-
 ghc/GHCi/UI.hs                                     |   4 +-
 ghc/GHCi/UI/Info.hs                                |  12 +-
 testsuite/tests/ghc-api/annotations/parseTree.hs   |   6 +-
 .../tests/ghc-api/annotations/stringSource.hs      |   6 +-
 testsuite/tests/ghc-api/annotations/t11430.hs      |   2 +-
 .../parser/should_compile/DumpParsedAst.stderr     |  28 +-
 .../parser/should_compile/DumpRenamedAst.stderr    | 141 ++--
 .../should_compile/DumpTypecheckedAst.stderr       |  73 +++
 .../tests/parser/should_compile/T14189.stderr      |  13 +-
 testsuite/tests/perf/haddock/all.T                 |   3 +-
 testsuite/tests/quasiquotation/T7918.hs            |   6 +-
 utils/ghctags/Main.hs                              |  25 +-
 utils/haddock                                      |   2 +-
 69 files changed, 3991 insertions(+), 2737 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 1aa1d405d8212a99ac24dcfd48024a17c3ffd296