summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/base/GHC/Exception.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/libraries/base/GHC/Exception.hs b/libraries/base/GHC/Exception.hs
index 3b32e230e8..ec564be016 100644
--- a/libraries/base/GHC/Exception.hs
+++ b/libraries/base/GHC/Exception.hs
@@ -77,10 +77,12 @@ errorCallException s = toException (ErrorCall s)
errorCallWithCallStackException :: String -> CallStack -> SomeException
errorCallWithCallStackException s stk = unsafeDupablePerformIO $ do
ccsStack <- currentCallStack
+ execStack <- ExecutionStack.showStackTrace
let
implicitParamCallStack = prettyCallStackLines stk
ccsCallStack = showCCSStack ccsStack
- stack = intercalate "\n" $ implicitParamCallStack ++ ccsCallStack
+ stack = intercalate "\n"
+ $ implicitParamCallStack ++ ccsCallStack ++ [ "Execution Stack:" ] ++ execStack
return $ toException (ErrorCallWithLocation s stack)
showCCSStack :: [String] -> [String]