diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2018-01-04 16:12:39 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2018-01-04 16:15:18 +0000 |
| commit | e2998d720c6b6bf72c86201d816f256a8ba704e6 (patch) | |
| tree | d6449f7ebc26b821b6ee192d15b66ee71447c1d1 | |
| parent | 954cbc7c106a20639960f55ebb85c5c972652d41 (diff) | |
| download | haskell-e2998d720c6b6bf72c86201d816f256a8ba704e6.tar.gz | |
Stop double-stacktrace in ASSERT failures
We were getting the stack trace printed twice in assertion
failures (e.g. see the Description of Trac #14552).
This fixes it, by deleting code.
(c.f. Trac #14635 which reports the same bug in documentation).
| -rw-r--r-- | compiler/utils/Outputable.hs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/utils/Outputable.hs b/compiler/utils/Outputable.hs index 3050fa1cf1..793b8fb139 100644 --- a/compiler/utils/Outputable.hs +++ b/compiler/utils/Outputable.hs @@ -1203,9 +1203,7 @@ warnPprTrace True file line msg x -- line number. Should typically be accessed with the ASSERT family of macros assertPprPanic :: HasCallStack => String -> Int -> SDoc -> a assertPprPanic _file _line msg - = pprPanic "ASSERT failed!" doc - where - doc = sep [ msg, callStackDoc ] + = pprPanic "ASSERT failed!" msg pprDebugAndThen :: DynFlags -> (String -> a) -> SDoc -> SDoc -> a pprDebugAndThen dflags cont heading pretty_msg |