Merge pull request #8030 from c-blake/devel

hotfix 3221ac0943 broke gc:regions/aka …
This commit is contained in:
Andreas Rumpf
2018-06-13 20:01:47 +02:00
committed by GitHub

View File

@@ -562,7 +562,8 @@ else:
when not declared(nimNewSeqOfCap):
proc nimNewSeqOfCap(typ: PNimType, cap: int): pointer {.compilerproc.} =
when defined(gcRegions):
result = newStr(typ, cap, ntfNoRefs notin typ.base.flags)
let s = mulInt(cap, typ.base.size) # newStr already adds GenericSeqSize
result = newStr(typ, s, ntfNoRefs notin typ.base.flags)
else:
let s = addInt(mulInt(cap, typ.base.size), GenericSeqSize)
when declared(newObjNoInit):