Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-8.6
Link : http://ghc.haskell.org/trac/ghc/changeset/a04ecd7ba8c7f012369eeb5864b813a130e043e3/ghc
>---------------------------------------------------------------
commit a04ecd7ba8c7f012369eeb5864b813a130e043e3
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
(cherry picked from commit d00c308633fe7d216d31a1087e00e63532d87d6d)
>---------------------------------------------------------------
a04ecd7ba8c7f012369eeb5864b813a130e043e3
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 a04ecd7ba8c7f012369eeb5864b813a130e043e3