mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-07-29 03:37:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4015 from arnetheduck/initallocator-fix

Browse Source 
fix initAllocator not being called when defined(nogc) and not defined…
This commit is contained in:
Andreas Rumpf
2016-10-13 23:25:05 +02:00
committed by GitHub
parent c3959ea6c3 4435d83a88
commit 3ba2d08bbc
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/system.nim
View File

@@ -2581,10 +2581,11 @@ else:
when not defined(JS): #and not defined(nimscript):
{.push stack_trace: off, profiler:off.}
when not defined(nimscript) and not defined(nogc):
when hasAlloc:
when not defined(gcStack):
proc initGC()
when not defined(boehmgc) and not defined(useMalloc) and not defined(gogc) and not defined(gcStack):
when not defined(boehmgc) and not defined(useMalloc) and
not defined(gogc) and not defined(gcStack):
proc initAllocator() {.inline.}
proc initStackBottom() {.inline, compilerproc.} =
@@ -2602,7 +2603,6 @@ when not defined(JS): #and not defined(nimscript):
when declared(setStackBottom):
setStackBottom(locals)
when hasAlloc:
var
strDesc = TNimType(size: sizeof(string), kind: tyString, flags: {ntfAcyclic})