summaryrefslogtreecommitdiff
path: root/testsuite/tests/concurrent
diff options
context:
space:
mode:
authorEric Seidel <gridaphobe@gmail.com>2016-04-04 12:05:01 +0200
committerBen Gamari <ben@smart-cactus.org>2016-04-04 13:05:20 +0200
commit7407a66d5bd29aa011f5a4228c6e2b2f7f8ad3f8 (patch)
treea79dbba0a8a0c3a7ecb12e1262487f0d876072c7 /testsuite/tests/concurrent
parent9b6820cdd6bac8b8346be48224627e3feefa9036 (diff)
downloadhaskell-7407a66d5bd29aa011f5a4228c6e2b2f7f8ad3f8.tar.gz
Don't infer CallStacks
We originally wanted CallStacks to be opt-in, but dealing with let binders complicated things, forcing us to infer CallStacks. It turns out that the inference is actually unnecessary though, we can let the wanted CallStacks bubble up to the outer context by refusing to quantify over them. Eventually they'll be solved from a given CallStack or defaulted to the empty CallStack if they reach the top. So this patch prevents GHC from quantifying over CallStacks, getting us back to the original plan. There's a small ugliness to do with PartialTypeSignatures, if the partial theta contains a CallStack constraint, we *do* want to quantify over the CallStack; the user asked us to! Note that this means that foo :: _ => CallStack foo = getCallStack callStack will be an *empty* CallStack, since we won't infer a CallStack for the hole in the theta. I think this is the right move though, since we want CallStacks to be opt-in. One can always write foo :: (HasCallStack, _) => CallStack foo = getCallStack callStack to get the CallStack and still have GHC infer the rest of the theta. Test Plan: ./validate Reviewers: goldfire, simonpj, austin, hvr, bgamari Reviewed By: simonpj, bgamari Subscribers: bitemyapp, thomie Projects: #ghc Differential Revision: https://phabricator.haskell.org/D1912 GHC Trac Issues: #11573
Diffstat (limited to 'testsuite/tests/concurrent')
-rw-r--r--testsuite/tests/concurrent/should_run/conc021.stderr3
1 files changed, 1 insertions, 2 deletions
diff --git a/testsuite/tests/concurrent/should_run/conc021.stderr b/testsuite/tests/concurrent/should_run/conc021.stderr
index 4c70f77f54..659f325726 100644
--- a/testsuite/tests/concurrent/should_run/conc021.stderr
+++ b/testsuite/tests/concurrent/should_run/conc021.stderr
@@ -1,4 +1,3 @@
conc021: wurble
-CallStack (from ImplicitParams):
+CallStack (from HasCallStack):
error, called at conc021.hs:9:9 in main:Main
- foo, called at conc021.hs:6:1 in main:Main