mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-06-04 19:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #4689

Browse Source
This commit is contained in:
Andreas Rumpf
2016-09-01 16:57:34 +02:00
parent 9c44403934
commit 11f7eb2d9b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/system/channels.nim
View File

@@ -124,8 +124,7 @@ proc storeAux(dest, src: pointer, mt: PNimType, t: PRawChannel,
of tyObject:
# copy type field:
var pint = cast[ptr PNimType](dest)
# XXX use dynamic type here!
pint[] = mt
pint[] = cast[ptr PNimType](src)[]
if mt.base != nil:
storeAux(dest, src, mt.base, t, mode)
storeAux(dest, src, mt.node, t, mode)
@@ -144,13 +143,12 @@ proc storeAux(dest, src: pointer, mt: PNimType, t: PRawChannel,
else:
unsureAsgnRef(x, nil)
else:
let size = if mt.base.kind == tyObject: cast[ptr PNimType](s)[].size
else: mt.base.size
if mode == mStore:
x[] = alloc(t.region, mt.base.size)
x[] = alloc(t.region, size)
else:
# 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
# a tyRef to the object!
var obj = newObj(mt, mt.base.size)
var obj = newObj(mt, size)
unsureAsgnRef(x, obj)
storeAux(x[], s, mt.base, t, mode)
if mode != mStore: dealloc(t.region, s)