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

fix #16384 and #17144 (#17126) [backport]

Browse source
This commit is contained in:
flywind 2021-03-03 18:58:50 +08:00 • committed by GitHub
commit 6391f6e861
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 209 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/vm.nim
View file

@ -1019,7 +1019,8 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
let nc = regs[rc].node let nc = regs[rc].node
if nb.kind != nc.kind: discard if nb.kind != nc.kind: discard
elif (nb == nc) or (nb.kind == nkNilLit): ret = true # intentional elif (nb == nc) or (nb.kind == nkNilLit): ret = true # intentional
elif sameConstant(nb, nc): ret = true elif (nb.kind in {nkSym, nkTupleConstr, nkClosure} and nb.typ.kind == tyProc) and sameConstant(nb, nc):
ret = true
# this also takes care of procvar's, represented as nkTupleConstr, e.g. (nil, nil) # this also takes care of procvar's, represented as nkTupleConstr, e.g. (nil, nil)
elif nb.kind == nkIntLit and nc.kind == nkIntLit and nb.intVal == nc.intVal: # TODO: nkPtrLit elif nb.kind == nkIntLit and nc.kind == nkIntLit and nb.intVal == nc.intVal: # TODO: nkPtrLit
let tb = nb.getTyp let tb = nb.getTyp

7
tests/stdlib/tlists.nim
View file

@ -2,11 +2,13 @@ discard """
targets: "c js" targets: "c js"
""" """
import lists, sequtils import std/[lists, sequtils]
const const
data = [1, 2, 3, 4, 5, 6] data = [1, 2, 3, 4, 5, 6]
template main =
block SinglyLinkedListTest1: block SinglyLinkedListTest1:
var L: SinglyLinkedList[int] var L: SinglyLinkedList[int]
for d in items(data): L.prepend(d) for d in items(data): L.prepend(d)
@ -231,3 +233,6 @@ block remove: # return value check
doAssert l.toSeq == [1] doAssert l.toSeq == [1]
doAssert l.remove(l.head) == true doAssert l.remove(l.head) == true
doAssert l.toSeq == [] doAssert l.toSeq == []
static: main()
main()