Merge branch 'devel' of github.com:nim-lang/Nim into devel

1 files changed, 3 insertions, 0 deletions

diff --git a/lib/system/jssys.nim b/lib/system/jssys.nim
index 31d283cd7..39ce1183b 100644
--- a/lib/system/jssys.nim
+++ b/lib/system/jssys.nim
@@ -109,6 +109,7 @@ proc rawWriteStackTrace(): string =
     result = "No stack traceback available\n"
 
 proc getStackTrace*(): string = rawWriteStackTrace()
+proc getStackTrace*(e: ref Exception): string = e.trace
 
 proc unhandledException(e: ref Exception) {.
     compilerproc, asmNoStackFrame.} =
@@ -142,6 +143,8 @@ proc raiseException(e: ref Exception, ename: cstring) {.
   when defined(nimphp):
     asm """throw new Exception($`e`["message"]);"""
   else:
+    when NimStackTrace:
+      e.trace = rawWriteStackTrace()
     asm "throw `e`;"
 
 proc reraiseException() {.compilerproc, asmNoStackFrame.} =