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

Merge remote-tracking branch 'origin/devel' into malloc-store-size

Browse source
This commit is contained in:
Jacek Sieka 2016-04-26 21:25:57 +08:00
commit ba1a52614b
91 changed files with 2061 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/system/mmdisp.nim
View file

@ -526,13 +526,17 @@ elif defined(nogc):
include "system/cellsets"
else:
include "system/alloc"
when not defined(gcStack):
include "system/alloc"
include "system/cellsets"
when not leakDetector and not useCellIds:
sysAssert(sizeof(Cell) == sizeof(FreeCell), "sizeof FreeCell")
include "system/cellsets"
when not leakDetector and not useCellIds:
sysAssert(sizeof(Cell) == sizeof(FreeCell), "sizeof FreeCell")
when compileOption("gc", "v2"):
include "system/gc2"
elif defined(gcStack):
# XXX due to bootstrapping reasons, we cannot use compileOption("gc", "stack") here
include "system/gc_stack"
elif defined(gcMarkAndSweep):
# XXX use 'compileOption' here
include "system/gc_ms"