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

fixes #10904

Browse source
This commit is contained in:
Araq 2019-03-26 15:57:48 +01:00
commit 3cf846e02c
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/sempass2.nim
View file

@ -708,7 +708,8 @@ proc track(tracked: PEffects, n: PNode) =
if getConstExpr(tracked.owner_module, n, tracked.graph) != nil:
return
if op != nil:
createTypeBoundOps(tracked.c, op, n.info)
if tracked.owner.kind != skMacro:
createTypeBoundOps(tracked.c, op, n.info)
if a.kind == nkCast and a[1].typ.kind == tyProc:
a = a[1]
# XXX: in rare situations, templates and macros will reach here after
@ -768,12 +769,14 @@ proc track(tracked: PEffects, n: PNode) =
addAsgnFact(tracked.guards, n.sons[0], n.sons[1])
notNilCheck(tracked, n.sons[1], n.sons[0].typ)
when false: cstringCheck(tracked, n)
createTypeBoundOps(tracked.c, n[0].typ, n.info)
if tracked.owner.kind != skMacro:
createTypeBoundOps(tracked.c, n[0].typ, n.info)
of nkVarSection, nkLetSection:
for child in n:
let last = lastSon(child)
if last.kind != nkEmpty: track(tracked, last)
createTypeBoundOps(tracked.c, child[0].typ, child.info)
if tracked.owner.kind != skMacro:
createTypeBoundOps(tracked.c, child[0].typ, child.info)
if child.kind == nkIdentDefs and last.kind != nkEmpty:
for i in 0 .. child.len-3:
initVar(tracked, child.sons[i], volatileCheck=false)