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

Fixing nimRawSetJmp for vcc and clangcl on Windows (#19959)

Browse source 
* fix vcc rawsetjmp

* changing `_longjmp()` to `longjmp()` and

`_setjmp()` to `setjmp()`

* fix

* fix setjmp to clangcl on Windows

* fix genTrySetjmp() to clangcl on Windows
This commit is contained in:
rockcavera 2022-07-04 08:52:44 -03:00 • committed by GitHub
commit d2d8f1342b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/ccgstmts.nim
View file

@ -1367,6 +1367,11 @@ proc genTrySetjmp(p: BProc, t: PNode, d: var TLoc) =
linefmt(p, cpsStmts, "$1.status = __builtin_setjmp($1.context);$n", [safePoint]) linefmt(p, cpsStmts, "$1.status = __builtin_setjmp($1.context);$n", [safePoint])
elif isDefined(p.config, "nimRawSetjmp"): elif isDefined(p.config, "nimRawSetjmp"):
if isDefined(p.config, "mswindows"): if isDefined(p.config, "mswindows"):
if isDefined(p.config, "vcc") or isDefined(p.config, "clangcl"):
# For the vcc compiler, use `setjmp()` with one argument.
# See https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/setjmp?view=msvc-170
linefmt(p, cpsStmts, "$1.status = setjmp($1.context);$n", [safePoint])
else:
# The Windows `_setjmp()` takes two arguments, with the second being an # The Windows `_setjmp()` takes two arguments, with the second being an
# undocumented buffer used by the SEH mechanism for stack unwinding. # undocumented buffer used by the SEH mechanism for stack unwinding.
# Mingw-w64 has been trying to get it right for years, but it's still # Mingw-w64 has been trying to get it right for years, but it's still

6
lib/system/ansi_c.nim
View file

@ -118,10 +118,14 @@ elif defined(nimBuiltinSetjmp):
c_builtin_setjmp(unsafeAddr jmpb[0]) c_builtin_setjmp(unsafeAddr jmpb[0])
elif defined(nimRawSetjmp) and not defined(nimStdSetjmp): elif defined(nimRawSetjmp) and not defined(nimStdSetjmp):
when defined(windows) and not defined(vcc): when defined(windows):
# No `_longjmp()` on Windows. # No `_longjmp()` on Windows.
proc c_longjmp*(jmpb: C_JmpBuf, retval: cint) {. proc c_longjmp*(jmpb: C_JmpBuf, retval: cint) {.
header: "<setjmp.h>", importc: "longjmp".} header: "<setjmp.h>", importc: "longjmp".}
when defined(vcc) or defined(clangcl):
proc c_setjmp*(jmpb: C_JmpBuf): cint {.
header: "<setjmp.h>", importc: "setjmp".}
else:
# The Windows `_setjmp()` takes two arguments, with the second being an # The Windows `_setjmp()` takes two arguments, with the second being an
# undocumented buffer used by the SEH mechanism for stack unwinding. # undocumented buffer used by the SEH mechanism for stack unwinding.
# Mingw-w64 has been trying to get it right for years, but it's still # Mingw-w64 has been trying to get it right for years, but it's still