summaryrefslogtreecommitdiff
path: root/testsuite/tests/annotations
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2015-11-03 14:06:09 +0000
committerSimon Marlow <marlowsd@gmail.com>2015-11-13 16:06:42 +0000
commit8988be8561ce0857f3befd6ab3b6c29060685c0a (patch)
tree88848de1dd8bc6664fd0de65f9b04415a4b4cc67 /testsuite/tests/annotations
parent8868ff3eb742977c5de2609f7d748f4ff8882d6d (diff)
downloadhaskell-8988be8561ce0857f3befd6ab3b6c29060685c0a.tar.gz
Make 'error' include the CCS call stack when profiled
Summary: The idea here is that this gives a more detailed stack trace in two cases: 1. With `-prof` and `-fprof-auto` 2. In GHCi (see #11047) Example, with an error inserted in nofib/shootout/binary-trees: ``` $ ./Main 3 Main: z CallStack (from ImplicitParams): error, called at Main.hs:67:29 in main:Main CallStack (from -prof): Main.check' (Main.hs:(67,1)-(68,82)) Main.check (Main.hs:63:1-21) Main.stretch (Main.hs:32:35-57) Main.main.c (Main.hs:32:9-57) Main.main (Main.hs:(27,1)-(43,42)) Main.CAF (<entire-module>) ``` This doesn't quite obsolete +RTS -xc, which also attempts to display more information in the case when the error is in a CAF, but I'm exploring other solutions to that. Includes submodule updates. Test Plan: validate Reviewers: simonpj, ezyang, gridaphobe, bgamari, hvr, austin Reviewed By: bgamari Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D1426
Diffstat (limited to 'testsuite/tests/annotations')
-rw-r--r--testsuite/tests/annotations/should_fail/annfail12.stderr2
1 files changed, 1 insertions, 1 deletions
diff --git a/testsuite/tests/annotations/should_fail/annfail12.stderr b/testsuite/tests/annotations/should_fail/annfail12.stderr
index 37e8378a7e..303645914e 100644
--- a/testsuite/tests/annotations/should_fail/annfail12.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail12.stderr
@@ -2,7 +2,7 @@
annfail12.hs:5:1: error:
Exception when trying to run compile-time code:
You were meant to see this error!
-CallStack:
+CallStack (from ImplicitParams):
error, called at annfail12.hs:5:12 in main:Annfail12
In the annotation:
{-# ANN f (error "You were meant to see this error!" :: Int) #-}