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

fix #13310, Deque misbehaves on VM (#13625)

Browse source 
* fix #13310, Deque misbehaves on VM
* use 'when nimVM'
This commit is contained in:
Miran 2020-03-11 17:30:36 +01:00 • committed by GitHub
commit 70bd41dae0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/pure/collections/deques.nim
View file

@ -274,8 +274,9 @@ proc expandIfNeeded[T](deq: var Deque[T]) =
if unlikely(deq.count >= cap): if unlikely(deq.count >= cap):
var n = newSeq[T](cap * 2) var n = newSeq[T](cap * 2)
var i = 0 var i = 0
for x in mitems(deq): # don't use copyMem because of the GC and because it's slower. for x in mitems(deq):
n[i] = move(x) when nimVM: n[i] = x # workaround for VM bug
else: n[i] = move(x)
inc i inc i
deq.data = move(n) deq.data = move(n)
deq.mask = cap * 2 - 1 deq.mask = cap * 2 - 1
@ -569,3 +570,15 @@ when isMainModule:
foo(2, 1) foo(2, 1)
foo(1, 5) foo(1, 5)
foo(3, 2) foo(3, 2)
import sets
block t13310:
proc main() =
var q = initDeque[HashSet[int16]](2)
q.addFirst([1'i16].toHashSet)
q.addFirst([2'i16].toHashSet)
q.addFirst([3'i16].toHashSet)
assert $q == "[{3}, {2}, {1}]"
static:
main()