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

fixes #7215

Browse source
This commit is contained in:
Andreas Rumpf 2018-02-14 10:09:35 +01:00
commit 89782460a3
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/ast.nim
View file

@ -1661,7 +1661,7 @@ proc isException*(t: PType): bool =
# check if `y` is object type and it inherits from Exception # check if `y` is object type and it inherits from Exception
assert(t != nil) assert(t != nil)
if t.kind != tyObject: if t.kind != tyObject:
return false return false
var base = t var base = t

7
compiler/vm.nim
View file

@ -1467,7 +1467,7 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
"request to create a NimNode of invalid kind") "request to create a NimNode of invalid kind")
let cc = regs[rc].node let cc = regs[rc].node
regs[ra].node = newNodeI(TNodeKind(int(k)), let x = newNodeI(TNodeKind(int(k)),
if cc.kind != nkNilLit: if cc.kind != nkNilLit:
cc.info cc.info
elif c.comesFromHeuristic.line > -1: elif c.comesFromHeuristic.line > -1:
@ -1476,7 +1476,10 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
c.callsite[1].info c.callsite[1].info
else: else:
c.debug[pc]) c.debug[pc])
regs[ra].node.flags.incl nfIsRef x.flags.incl nfIsRef
# prevent crashes in the compiler resulting from wrong macros:
if x.kind == nkIdent: x.ident = getIdent""
regs[ra].node = x
of opcNCopyNimNode: of opcNCopyNimNode:
decodeB(rkNode) decodeB(rkNode)
regs[ra].node = copyNode(regs[rb].node) regs[ra].node = copyNode(regs[rb].node)

2
lib/pure/collections/sequtils.nim
View file

@ -711,7 +711,7 @@ proc mapLitsImpl(constructor: NimNode; op: NimNode; nested: bool;
result.add op result.add op
result.add constructor result.add constructor
else: else:
result = newNimNode(constructor.kind, lineInfoFrom=constructor) result = copyNimNode(constructor)
for v in constructor: for v in constructor:
if nested or v.kind in filter: if nested or v.kind in filter:
result.add mapLitsImpl(v, op, nested, filter) result.add mapLitsImpl(v, op, nested, filter)