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

fixes #16365 [backport] (#16381)

Browse source
This commit is contained in:
Andreas Rumpf 2020-12-17 23:21:55 +01:00 • committed by GitHub
commit 868c31e88a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/system/strs_v2.nim
View file

@ -40,21 +40,22 @@ 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.} =
let newLen = s.len + addlen
if isLiteral(s): if isLiteral(s):
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:
when compileOption("threads"): when compileOption("threads"):
s.p = cast[ptr NimStrPayload](allocShared0(contentSize(s.len + addlen))) s.p = cast[ptr NimStrPayload](allocShared0(contentSize(newLen)))
else: else:
s.p = cast[ptr NimStrPayload](alloc0(contentSize(s.len + addlen))) s.p = cast[ptr NimStrPayload](alloc0(contentSize(newLen)))
s.p.cap = s.len + addlen s.p.cap = newLen
if s.len > 0: if s.len > 0:
# we are about to append, so there is no need to copy the \0 terminator: # we are about to append, so there is no need to copy the \0 terminator:
copyMem(unsafeAddr s.p.data[0], unsafeAddr oldP.data[0], s.len) copyMem(unsafeAddr s.p.data[0], unsafeAddr oldP.data[0], min(s.len, newLen))
else: else:
let oldCap = s.p.cap and not strlitFlag let oldCap = s.p.cap and not strlitFlag
if s.len + addlen > oldCap: if newLen > oldCap:
let newCap = max(s.len + addlen, resize(oldCap)) let newCap = max(newLen, resize(oldCap))
when compileOption("threads"): when compileOption("threads"):
s.p = cast[ptr NimStrPayload](reallocShared0(s.p, contentSize(oldCap), contentSize(newCap))) s.p = cast[ptr NimStrPayload](reallocShared0(s.p, contentSize(oldCap), contentSize(newCap)))
else: else:

32
tests/destructor/tnewruntime_strutils.nim
View file

@ -2,7 +2,10 @@ discard """
valgrind: true valgrind: true
cmd: '''nim c -d:nimAllocStats --newruntime -d:useMalloc $file''' cmd: '''nim c -d:nimAllocStats --newruntime -d:useMalloc $file'''
output: ''' output: '''
@[(input: @["KXSC", "BGMC"]), (input: @["PXFX"]), (input: @["WXRQ", "ZSCZD"])]''' @[(input: @["KXSC", "BGMC"]), (input: @["PXFX"]), (input: @["WXRQ", "ZSCZD"])]
14
First tasks completed.
Second tasks completed.'''
""" """
import strutils, os, std / wordwrap import strutils, os, std / wordwrap
@ -211,3 +214,30 @@ staticTests()
# bug #12965 # bug #12965
let xaa = @[""].join() let xaa = @[""].join()
let xbb = @["", ""].join() let xbb = @["", ""].join()
# bug #16365
# Task 1:
when true:
# Task 1_a:
var test_string_a = "name_something"
echo test_string_a.len()
let new_len_a = test_string_a.len - "_something".len()
test_string_a.setLen new_len_a
echo "First tasks completed."
# Task 2:
when true:
# Task 2_a
var test_string: string
let some_string = "something"
for i in some_string.items:
test_string.add $i
# Task 2_b
var test_string_b = "name_something"
let new_len_b = test_string_b.len - "_something".len()
test_string_b.setLen new_len_b
echo "Second tasks completed."