[commit: ghc] master: Fix for recover with -fexternal-interpreter (#15418) (d00c308)

git at git.haskell.org git at git.haskell.org
Thu Sep 27 15:53:42 UTC 2018


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

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

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

commit d00c308633fe7d216d31a1087e00e63532d87d6d
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Sep 26 15:32:29 2018 -0500

    Fix for recover with -fexternal-interpreter (#15418)
    
    Summary:
    When using -fexternal-interpreter, recover was not treating a Q
    compuation that simply registered an error with addErrTc as failing.
    
    Test Plan:
    New unit tests:
    * T15418 is the repro from in the ticket
    * TH_recover_warns is a new test to ensure that we're keeping warnings when
      the body of recover succeeds.
    
    Reviewers: bgamari, RyanGlScott, angerman, goldfire, erikd
    
    Subscribers: rwbarton, carter
    
    GHC Trac Issues: #15418
    
    Differential Revision: https://phabricator.haskell.org/D5185


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

d00c308633fe7d216d31a1087e00e63532d87d6d
 compiler/typecheck/TcSplice.hs             | 28 +++++++++++++++++++---------
 libraries/ghci/GHCi/Message.hs             | 17 ++++++++++-------
 libraries/ghci/GHCi/TH.hs                  | 13 +++++++------
 testsuite/tests/th/T15481.hs               | 10 ++++++++++
 testsuite/tests/th/T15481.stderr           |  8 ++++++++
 testsuite/tests/th/TH_recover_warns.hs     | 10 ++++++++++
 testsuite/tests/th/TH_recover_warns.stderr | 15 +++++++++++++++
 testsuite/tests/th/all.T                   |  2 ++
 8 files changed, 81 insertions(+), 22 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 d00c308633fe7d216d31a1087e00e63532d87d6d


More information about the ghc-commits mailing list