diff options
| author | Araq <rumpf_a@web.de> | 2017-12-08 10:06:36 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2017-12-08 10:06:36 +0100 |
| commit | 4be45f5913de93e403ed14b8665037092bb378b4 (patch) | |
| tree | 5b6e8c1d8f67ecd24979455667e9fe855041aa1a /lib | |
| parent | 9820c2c4561ee56f30c1578672dd1247be25cb11 (diff) | |
| parent | e016c9253e7b02ad4781452067dad980c677f61e (diff) | |
| download | Nim-4be45f5913de93e403ed14b8665037092bb378b4.tar.gz | |
Merge branch 'devel' of github.com:nim-lang/Nim into devel
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pure/collections/sequtils.nim | 4 | ||||
| -rw-r--r-- | lib/system/sysstr.nim | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/pure/collections/sequtils.nim b/lib/pure/collections/sequtils.nim index d0f5c78e0..06e96ca36 100644 --- a/lib/pure/collections/sequtils.nim +++ b/lib/pure/collections/sequtils.nim @@ -66,7 +66,7 @@ proc cycle*[T](s: openArray[T], n: Natural): seq[T] = ## ## Example: ## - ## .. code-block: + ## .. code-block:: ## ## let ## s = @[1, 2, 3] @@ -84,7 +84,7 @@ proc repeat*[T](x: T, n: Natural): seq[T] = ## ## Example: ## - ## .. code-block: + ## .. code-block:: ## ## let ## total = repeat(5, 3) diff --git a/lib/system/sysstr.nim b/lib/system/sysstr.nim index 3f8e0eff0..56b8ade97 100644 --- a/lib/system/sysstr.nim +++ b/lib/system/sysstr.nim @@ -259,7 +259,7 @@ proc incrSeqV2(seq: PGenericSeq, elemSize: int): PGenericSeq {.compilerProc.} = result.reserved = r proc setLengthSeq(seq: PGenericSeq, elemSize, newLen: int): PGenericSeq {. - compilerRtl.} = + compilerRtl, inl.} = result = seq if result.space < newLen: let r = max(resize(result.space), newLen) @@ -282,10 +282,11 @@ proc setLengthSeq(seq: PGenericSeq, elemSize, newLen: int): PGenericSeq {. doDecRef(gch.tempStack.d[i], LocalHeap, MaybeCyclic) gch.tempStack.len = len0 else: - for i in newLen..result.len-1: - forAllChildrenAux(cast[pointer](cast[ByteAddress](result) +% - GenericSeqSize +% (i*%elemSize)), - extGetCellType(result).base, waZctDecRef) + if ntfNoRefs notin extGetCellType(result).base.flags: + for i in newLen..result.len-1: + forAllChildrenAux(cast[pointer](cast[ByteAddress](result) +% + GenericSeqSize +% (i*%elemSize)), + extGetCellType(result).base, waZctDecRef) # XXX: zeroing out the memory can still result in crashes if a wiped-out # cell is aliased by another pointer (ie proc parameter or a let variable). |