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

fixes #10845

Browse source
This commit is contained in:
Andreas Rumpf 2019-03-15 14:57:40 +01:00
commit 8e5c1436ad
1 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
lib/system/sysstr.nim
View file

@ -116,22 +116,27 @@ proc newOwnedString(src: NimString; n: int): NimString =
proc copyStringRC1(src: NimString): NimString {.compilerRtl.} = proc copyStringRC1(src: NimString): NimString {.compilerRtl.} =
if src != nil: if src != nil:
when declared(newObjRC1) and not defined(gcRegions): if (src.reserved and seqShallowFlag) != 0:
var s = src.len result = src
if s < 7: s = 7 when declared(incRef):
result = cast[NimString](newObjRC1(addr(strDesc), sizeof(TGenericSeq) + incRef(usrToCell(result))
s+1))
result.reserved = s
when defined(gogc):
result.elemSize = 1
else: else:
result = rawNewStringNoInit(src.len) when declared(newObjRC1) and not defined(gcRegions):
result.len = src.len var s = src.len
copyMem(addr(result.data), addr(src.data), src.len + 1) if s < 7: s = 7
sysAssert((seqShallowFlag and result.reserved) == 0, "copyStringRC1") result = cast[NimString](newObjRC1(addr(strDesc), sizeof(TGenericSeq) +
when defined(nimShallowStrings): s+1))
if (src.reserved and strlitFlag) != 0: result.reserved = s
result.reserved = (result.reserved and not strlitFlag) or seqShallowFlag when defined(gogc):
result.elemSize = 1
else:
result = rawNewStringNoInit(src.len)
result.len = src.len
copyMem(addr(result.data), addr(src.data), src.len + 1)
sysAssert((seqShallowFlag and result.reserved) == 0, "copyStringRC1")
when defined(nimShallowStrings):
if (src.reserved and strlitFlag) != 0:
result.reserved = (result.reserved and not strlitFlag) or seqShallowFlag
proc copyDeepString(src: NimString): NimString {.inline.} = proc copyDeepString(src: NimString): NimString {.inline.} =
if src != nil: if src != nil: