[commit: ghc] wip/merge-queue: Run typed splices in the zonker (c2455e6)

git at git.haskell.org git at git.haskell.org
Sun Jan 13 00:06:03 UTC 2019


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

On branch  : wip/merge-queue
Link       : http://ghc.haskell.org/trac/ghc/changeset/c2455e647501c5a382861196b64df3dd05b620a2/ghc

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

commit c2455e647501c5a382861196b64df3dd05b620a2
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Wed Jan 9 14:52:30 2019 +0000

    Run typed splices in the zonker
    
    Summary:
    This fixes #15471
    
    In the typechecker we check that the splice has the right type but we
    crucially don't zonk the generated expression. This is because we might
    end up unifying type variables from outer scopes later on.
    
    Reviewers: simonpj, goldfire, bgamari
    
    Subscribers: rwbarton, carter
    
    GHC Trac Issues: #15471
    
    Differential Revision: https://phabricator.haskell.org/D5286


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

c2455e647501c5a382861196b64df3dd05b620a2
 compiler/deSugar/DsMeta.hs           |   1 +
 compiler/hieFile/HieAst.hs           |   2 +
 compiler/hsSyn/HsExpr.hs             |  20 +++++++
 compiler/rename/RnSplice.hs          |  12 ++++-
 compiler/typecheck/TcHsSyn.hs        |   5 ++
 compiler/typecheck/TcPatSyn.hs       |   1 +
 compiler/typecheck/TcRnDriver.hs     |  73 ++++++++++++++++---------
 compiler/typecheck/TcRnTypes.hs-boot |   6 +++
 compiler/typecheck/TcSplice.hs       | 101 +++++++++++++++++++++++++++++------
 compiler/typecheck/TcSplice.hs-boot  |   6 ++-
 testsuite/tests/th/T15471.hs         |  11 ++++
 testsuite/tests/th/T15471A.hs        |  14 +++++
 testsuite/tests/th/all.T             |   1 +
 13 files changed, 209 insertions(+), 44 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 c2455e647501c5a382861196b64df3dd05b620a2


More information about the ghc-commits mailing list