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

fixes #12965 (#12991)

Browse source
This commit is contained in:
Andreas Rumpf 2019-12-31 09:42:18 +01:00 • committed by GitHub
commit ce40ed18bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/system/strs_v2.nim
View file

@ -37,7 +37,8 @@ proc resize(old: int): int {.inline.} =
else: result = old * 3 div 2 # for large arrays * 3/2 is better else: result = old * 3 div 2 # for large arrays * 3/2 is better
proc prepareAdd(s: var NimStringV2; addlen: int) {.compilerRtl.} = proc prepareAdd(s: var NimStringV2; addlen: int) {.compilerRtl.} =
if isLiteral(s) and addlen > 0: if isLiteral(s):
if addlen > 0:
let oldP = s.p let oldP = s.p
# can't mutate a literal, so we need a fresh copy here: # can't mutate a literal, so we need a fresh copy here:
let allocator = getLocalAllocator() let allocator = getLocalAllocator()

4
tests/destructor/tnewruntime_strutils.nim
View file

@ -210,5 +210,9 @@ proc staticTests =
nonStaticTests() nonStaticTests()
staticTests() staticTests()
# bug #12965
let xaa = @[""].join()
let xbb = @["", ""].join()
let (a, d) = allocCounters() let (a, d) = allocCounters()
discard cprintf("%ld %ld\n", a, d) discard cprintf("%ld %ld\n", a, d)