diff options
author | Oscar NihlgÄrd <oscarnihlgard@gmail.com> | 2018-06-30 09:16:46 +0200 |
---|---|---|
committer | Andreas Rumpf <rumpf_a@web.de> | 2018-06-30 09:16:46 +0200 |
commit | d146045ed55a45428991ece55e13afb742b2fdc4 (patch) | |
tree | da972bf0a73307e85c7bc39c88d9a9a5719a87bf /compiler/vm.nim | |
parent | 0a14b3d1980e116bd40a98d5d2b414a0e1d05a1c (diff) | |
download | Nim-d146045ed55a45428991ece55e13afb742b2fdc4.tar.gz |
Fixes #6689 (#8135)
Diffstat (limited to 'compiler/vm.nim')
-rw-r--r-- | compiler/vm.nim | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/compiler/vm.nim b/compiler/vm.nim index c8e595f5d..9e5db978c 100644 --- a/compiler/vm.nim +++ b/compiler/vm.nim @@ -1211,8 +1211,14 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg = of opcIsNil: decodeB(rkInt) let node = regs[rb].node - regs[ra].intVal = ord(node.kind == nkNilLit or - (node.kind in {nkStrLit..nkTripleStrLit} and node.strVal.isNil)) + regs[ra].intVal = ord( + # Note that `nfIsRef` + `nkNilLit` represents an allocated + # reference with the value `nil`, so `isNil` should be false! + (node.kind == nkNilLit and nfIsRef notin node.flags) or + (node.kind in {nkStrLit..nkTripleStrLit} and node.strVal.isNil) or + (not node.typ.isNil and node.typ.kind == tyProc and + node.typ.callConv == ccClosure and node.sons[0].kind == nkNilLit and + node.sons[1].kind == nkNilLit)) of opcNBindSym: decodeBx(rkNode) regs[ra].node = copyTree(c.constants.sons[rbx]) |