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

Remove side-effects from sysFatal with panics on (#20632)

Browse source
This commit is contained in:
Tanguy 2022-10-24 07:57:49 +02:00 • committed by GitHub
commit 4578e773ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/system/fatal.nim
View file

@ -17,23 +17,24 @@ else:
when hostOS == "standalone": when hostOS == "standalone":
include "$projectpath/panicoverride" include "$projectpath/panicoverride"
proc sysFatal(exceptn: typedesc, message: string) {.inline.} = func sysFatal(exceptn: typedesc, message: string) {.inline.} =
panic(message) panic(message)
proc sysFatal(exceptn: typedesc, message, arg: string) {.inline.} = func sysFatal(exceptn: typedesc, message, arg: string) {.inline.} =
rawoutput(message) rawoutput(message)
panic(arg) panic(arg)
elif (defined(nimQuirky) or defined(nimPanics)) and not defined(nimscript): elif (defined(nimQuirky) or defined(nimPanics)) and not defined(nimscript):
import ansi_c import ansi_c
proc name(t: typedesc): string {.magic: "TypeTrait".} func name(t: typedesc): string {.magic: "TypeTrait".}
proc sysFatal(exceptn: typedesc, message, arg: string) {.inline, noreturn.} = func sysFatal(exceptn: typedesc, message, arg: string) {.inline, noreturn.} =
when nimvm: when nimvm:
# TODO when doAssertRaises works in CT, add a test for it # TODO when doAssertRaises works in CT, add a test for it
raise (ref exceptn)(msg: message & arg) raise (ref exceptn)(msg: message & arg)
else: else:
{.noSideEffect.}:
writeStackTrace() writeStackTrace()
var buf = newStringOfCap(200) var buf = newStringOfCap(200)
add(buf, "Error: unhandled exception: ") add(buf, "Error: unhandled exception: ")
@ -45,14 +46,14 @@ elif (defined(nimQuirky) or defined(nimPanics)) and not defined(nimscript):
cstderr.rawWrite buf cstderr.rawWrite buf
quit 1 quit 1
proc sysFatal(exceptn: typedesc, message: string) {.inline, noreturn.} = func sysFatal(exceptn: typedesc, message: string) {.inline, noreturn.} =
sysFatal(exceptn, message, "") sysFatal(exceptn, message, "")
else: else:
proc sysFatal(exceptn: typedesc, message: string) {.inline, noreturn.} = func sysFatal(exceptn: typedesc, message: string) {.inline, noreturn.} =
raise (ref exceptn)(msg: message) raise (ref exceptn)(msg: message)
proc sysFatal(exceptn: typedesc, message, arg: string) {.inline, noreturn.} = func sysFatal(exceptn: typedesc, message, arg: string) {.inline, noreturn.} =
raise (ref exceptn)(msg: message & arg) raise (ref exceptn)(msg: message & arg)
{.pop.} {.pop.}

8
tests/exception/t20613.nim Normal file
View file

@ -0,0 +1,8 @@
discard """
matrix: "; --panics:on"
"""
func test =
if 0 > 10:
raiseAssert "hey"
test()