Merge remote-tracking branch 'origin/devel' into compiler-cleanup

This commit is contained in:
Jacek Sieka 2016-08-17 18:49:36 +08:00
commit 4d558e2608
11 changed files with 45 additions and 21 deletions

View file

@ -528,7 +528,7 @@ proc isOwnedProcVar(n: PNode; owner: PSym): bool =
proc trackOperand(tracked: PEffects, n: PNode, paramType: PType) =
let a = skipConvAndClosure(n)
let op = a.typ
if op != nil and op.kind == tyProc and n.kind != nkNilLit:
if op != nil and op.kind == tyProc and n.skipConv.kind != nkNilLit:
internalAssert op.n.sons[0].kind == nkEffectList
var effectList = op.n.sons[0]
let s = n.skipConv