Revert "system/excpt: check if the exception is not nil before pop (#…

…18247)" (#18265) This reverts commit 0adb47a.
nim-lang · Jun 17, 2021 · fd8b797 · fd8b797
1 parent 969cb97
commit fd8b797
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/lib/system/excpt.nim b/lib/system/excpt.nim
@@ -135,9 +135,8 @@ proc pushCurrentException(e: sink(ref Exception)) {.compilerRtl, inl.} =
   #showErrorMessage2 "A"
 
 proc popCurrentException {.compilerRtl, inl.} =
-  if currException != nil:
-    currException = currException.up
-    #showErrorMessage2 "B"
+  currException = currException.up
+  #showErrorMessage2 "B"
 
 proc popCurrentExceptionEx(id: uint) {.compilerRtl.} =
   discard "only for bootstrapping compatbility"

diff --git a/tests/exception/tsetexceptions.nim b/tests/exception/tsetexceptions.nim
@@ -6,10 +6,3 @@ let ex = newException(CatchableError, "test")
 setCurrentException(ex)
 doAssert getCurrentException().msg == ex.msg
 doAssert getCurrentExceptionMsg() == ex.msg
-setCurrentException(nil)
-
-try:
-  raise newException(CatchableError, "test2")
-except:
-  setCurrentException(nil)
-doAssert getCurrentException() == nil