jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implements #9434. Minimal Stacktrace for Exceptions in release mode (#9480)

Browse source 
* Fixes #9434
This commit is contained in:
cooldome 2018-10-28 12:40:42 +00:00 • committed by Andreas Rumpf
commit dfb8730f51
4 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/system/excpt.nim
View file

@ -381,6 +381,8 @@ proc raiseExceptionAux(e: ref Exception) =
xadd(buf, s, s.len)
var buf: array[0..2000, char]
var L = 0
if e.trace.len != 0:
add(buf, $e.trace) # gc allocation
add(buf, "Error: unhandled exception: ")
add(buf, e.msg)
add(buf, " [")
@ -394,7 +396,7 @@ proc raiseExceptionAux(e: ref Exception) =
showErrorMessage(tbuf())
quitOrDebug()
proc raiseException(e: ref Exception, ename: cstring) {.compilerRtl.} =
proc raiseExceptionEx(e: ref Exception, ename, procname, filename: cstring, line: int) {.compilerRtl.} =
if e.name.isNil: e.name = ename
when hasSomeStackTrace:
if e.trace.len == 0:
@ -403,8 +405,14 @@ proc raiseException(e: ref Exception, ename: cstring) {.compilerRtl.} =
e.trace.add reraisedFrom(reraisedFromBegin)
auxWriteStackTrace(framePtr, e.trace)
e.trace.add reraisedFrom(reraisedFromEnd)
else:
if procname != nil and filename != nil:
e.trace.add StackTraceEntry(procname: procname, filename: filename, line: line)
raiseExceptionAux(e)
proc raiseException(e: ref Exception, ename: cstring) {.compilerRtl.} =
raiseExceptionEx(e, ename, nil, nil, 0)
proc reraiseException() {.compilerRtl.} =
if currException == nil:
sysFatal(ReraiseError, "no exception to reraise")