diff options
| -rw-r--r-- | lib/system.nim | 1 | ||||
| -rw-r--r-- | lib/system/excpt.nim | 5 | ||||
| -rw-r--r-- | tests/exception/tfinally3.nim | 17 |
3 files changed, 17 insertions, 6 deletions
diff --git a/lib/system.nim b/lib/system.nim index 424d9694d..8f653c1e0 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -442,6 +442,7 @@ type ## providing an exception message ## is bad style. trace: string + up: ref Exception # used for stacking exceptions. Not exported! SystemError* = object of Exception ## \ ## Abstract class for exceptions that the runtime system raises. diff --git a/lib/system/excpt.nim b/lib/system/excpt.nim index b0769b269..e35b0bd5d 100644 --- a/lib/system/excpt.nim +++ b/lib/system/excpt.nim @@ -73,12 +73,11 @@ proc popSafePoint {.compilerRtl, inl.} = excHandler = excHandler.prev proc pushCurrentException(e: ref Exception) {.compilerRtl, inl.} = - #if e.parent.isNil: - # e.parent = currException + e.up = currException currException = e proc popCurrentException {.compilerRtl, inl.} = - currException = nil # currException.parent + currException = currException.up # some platforms have native support for stack traces: const diff --git a/tests/exception/tfinally3.nim b/tests/exception/tfinally3.nim index 8bccd1a7f..037ca9553 100644 --- a/tests/exception/tfinally3.nim +++ b/tests/exception/tfinally3.nim @@ -1,6 +1,11 @@ discard """ file: "tfinally3.nim" - output: "false" + output: '''false +Within finally->try +Traceback (most recent call last) +tfinally3.nim(24) tfinally3 +Error: unhandled exception: First [Exception]''' + exitCode: 1 """ # Test break in try statement: @@ -14,5 +19,11 @@ proc main: bool = echo main() #OUT false - - +# bug #5871 +try: + raise newException(Exception, "First") +finally: + try: + raise newException(Exception, "Within finally->try") + except: + echo getCurrentExceptionMsg() |