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

fixes #18570 (#18599)

Browse source
This commit is contained in:
Andreas Rumpf 2021-07-27 12:48:27 +02:00 • committed by GitHub
commit c86f9590fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/injectdestructors.nim
View file

@ -799,7 +799,8 @@ proc p(n: PNode; c: var Con; s: var Scope; mode: ProcessMode): PNode =
result[i] = p(n[i], c, s, m) result[i] = p(n[i], c, s, m)
of nkObjConstr: of nkObjConstr:
# see also the remark about `nkTupleConstr`. # see also the remark about `nkTupleConstr`.
let isRefConstr = n.typ.skipTypes(abstractInst).kind == tyRef let t = n.typ.skipTypes(abstractInst)
let isRefConstr = t.kind == tyRef
let m = if isRefConstr: sinkArg let m = if isRefConstr: sinkArg
elif mode == normal: normal elif mode == normal: normal
else: sinkArg else: sinkArg
@ -807,7 +808,7 @@ proc p(n: PNode; c: var Con; s: var Scope; mode: ProcessMode): PNode =
result = copyTree(n) result = copyTree(n)
for i in 1..<n.len: for i in 1..<n.len:
if n[i].kind == nkExprColonExpr: if n[i].kind == nkExprColonExpr:
let field = lookupFieldAgain(n.typ, n[i][0].sym) let field = lookupFieldAgain(t, n[i][0].sym)
if field != nil and sfCursor in field.flags: if field != nil and sfCursor in field.flags:
result[i][1] = p(n[i][1], c, s, normal) result[i][1] = p(n[i][1], c, s, normal)
else: else: