diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2015-11-03 14:06:09 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2015-11-13 16:06:42 +0000 |
| commit | 8988be8561ce0857f3befd6ab3b6c29060685c0a (patch) | |
| tree | 88848de1dd8bc6664fd0de65f9b04415a4b4cc67 /testsuite/tests/simplCore | |
| parent | 8868ff3eb742977c5de2609f7d748f4ff8882d6d (diff) | |
| download | haskell-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/simplCore')
4 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/tests/simplCore/should_fail/T7411.stderr b/testsuite/tests/simplCore/should_fail/T7411.stderr index 59c0617e9b..6fc6a22560 100644 --- a/testsuite/tests/simplCore/should_fail/T7411.stderr +++ b/testsuite/tests/simplCore/should_fail/T7411.stderr @@ -1,4 +1,4 @@ T7411: Prelude.undefined -CallStack: - error, called at libraries/base/GHC/Err.hs:42:14 in base:GHC.Err +CallStack (from ImplicitParams): + error, called at libraries/base/GHC/Err.hs:43:14 in base:GHC.Err undefined, called at T7411.hs:3:25 in main:Main diff --git a/testsuite/tests/simplCore/should_run/T457.stderr b/testsuite/tests/simplCore/should_run/T457.stderr index 983c8dba39..c84855e500 100644 --- a/testsuite/tests/simplCore/should_run/T457.stderr +++ b/testsuite/tests/simplCore/should_run/T457.stderr @@ -1,3 +1,3 @@ T457: Correct -CallStack: +CallStack (from ImplicitParams): error, called at T457.hs:5:22 in main:Main diff --git a/testsuite/tests/simplCore/should_run/T5587.stderr b/testsuite/tests/simplCore/should_run/T5587.stderr index d98a36d986..069d08d055 100644 --- a/testsuite/tests/simplCore/should_run/T5587.stderr +++ b/testsuite/tests/simplCore/should_run/T5587.stderr @@ -1,3 +1,3 @@ T5587: hidden error -CallStack: +CallStack (from ImplicitParams): error, called at T5587.hs:7:15 in main:Main diff --git a/testsuite/tests/simplCore/should_run/T5625.stderr b/testsuite/tests/simplCore/should_run/T5625.stderr index f272d99787..fe02e7e6a8 100644 --- a/testsuite/tests/simplCore/should_run/T5625.stderr +++ b/testsuite/tests/simplCore/should_run/T5625.stderr @@ -1,4 +1,4 @@ T5625: Prelude.undefined -CallStack: - error, called at libraries/base/GHC/Err.hs:42:14 in base:GHC.Err +CallStack (from ImplicitParams): + error, called at libraries/base/GHC/Err.hs:43:14 in base:GHC.Err undefined, called at T5625.hs:3:31 in main:Main |