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

Merge branch 'master' of github.com:Araq/Nimrod

Browse source
This commit is contained in:
Araq 2013-08-11 18:48:59 +02:00
commit 1633e22aec
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/system/channels.nim
View file

@ -143,7 +143,7 @@ proc storeAux(dest, src: Pointer, mt: PNimType, t: PRawChannel,
# XXX we should use the dynamic type here too, but that is not stored # XXX we should use the dynamic type here too, but that is not stored
# in the inbox at all --> use source[]'s object type? but how? we need # in the inbox at all --> use source[]'s object type? but how? we need
# a tyRef to the object! # a tyRef to the object!
var obj = newObj(mt.base, mt.base.size) var obj = newObj(mt, mt.base.size)
unsureAsgnRef(x, obj) unsureAsgnRef(x, obj)
storeAux(x[], s, mt.base, t, mode) storeAux(x[], s, mt.base, t, mode)
if mode != mStore: Dealloc(t.region, s) if mode != mStore: Dealloc(t.region, s)

2
lib/system/gc.nim
View file

@ -90,6 +90,8 @@ template gcAssert(cond: bool, msg: string) =
when defined(useGcAssert): when defined(useGcAssert):
if not cond: if not cond:
echo "[GCASSERT] ", msg echo "[GCASSERT] ", msg
GC_disable()
writeStackTrace()
quit 1 quit 1
proc addZCT(s: var TCellSeq, c: PCell) {.noinline.} = proc addZCT(s: var TCellSeq, c: PCell) {.noinline.} =