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

fixes #14900, this time for real, maybe (#14934)

Browse source
This commit is contained in:
Andreas Rumpf 2020-07-08 14:47:14 +02:00 • committed by GitHub
commit 06d776a582
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/injectdestructors.nim
View file

@ -134,7 +134,7 @@ proc toTree(c: var Con; s: var Scope; ret: PNode; flags: set[ToTreeFlag]): PNode
var r = PNode(nil)
if isExpr:
result = newNodeIT(nkStmtListExpr, ret.info, ret.typ)
if ret.kind == nkStmtListExpr:
if ret.kind in nkCallKinds + {nkStmtListExpr}:
r = getTemp(c, s, ret.typ, ret.info)
else:
result = newNodeI(nkStmtList, ret.info)
@ -155,7 +155,13 @@ proc toTree(c: var Con; s: var Scope; ret: PNode; flags: set[ToTreeFlag]): PNode
result.add newTryFinally(ret, finSection)
else:
if r != nil:
result.add newTree(nkFastAsgn, r, ret)
if ret.kind == nkStmtListExpr:
# simplify it a bit further by merging the nkStmtListExprs
let last = ret.len - 1
for i in 0 ..< last: result.add ret[i]
result.add newTree(nkFastAsgn, r, ret[last])
else:
result.add newTree(nkFastAsgn, r, ret)
else:
result.add ret
for m in s.wasMoved: result.add m