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

Improve approach

Browse source
This commit is contained in:
Andrii Riabushenko 2018-11-30 09:36:04 +00:00
commit e90f70af42
1 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

45
compiler/destroyer.nim
View file

@ -411,10 +411,12 @@ proc passCopyToSink(n: PNode; c: var Con): PNode =
result.add tmp result.add tmp
proc pArg(arg: PNode; c: var Con; isSink: bool): PNode = proc pArg(arg: PNode; c: var Con; isSink: bool): PNode =
if arg.typ == nil: template pArgIfTyped(arg_part: PNode): PNode =
# typ is nil if we are in if/case branch with noreturn # typ is nil if we are in if/case expr branch with noreturn
result = copyTree(arg) if arg_part.typ == nil: copyTree(arg_part)
elif isSink: else: pArg(arg_part, c, isSink)
if isSink:
if arg.kind in nkCallKinds: if arg.kind in nkCallKinds:
# recurse but skip the call expression in order to prevent # recurse but skip the call expression in order to prevent
# destructor injections: Rule 5.1 is different from rule 5.4! # destructor injections: Rule 5.1 is different from rule 5.4!
@ -446,9 +448,9 @@ proc pArg(arg: PNode; c: var Con; isSink: bool): PNode =
var branch = copyNode(arg[i]) var branch = copyNode(arg[i])
if arg[i].kind in {nkElifBranch, nkElifExpr}: if arg[i].kind in {nkElifBranch, nkElifExpr}:
branch.add p(arg[i][0], c) branch.add p(arg[i][0], c)
branch.add pArg(arg[i][1], c, isSink) branch.add pArgIfTyped(arg[i][1])
else: else:
branch.add pArg(arg[i][0], c, isSink) branch.add pArgIfTyped(arg[i][0])
result.add branch result.add branch
elif arg.kind == nkCaseStmt: elif arg.kind == nkCaseStmt:
result = copyNode(arg) result = copyNode(arg)
@ -457,14 +459,14 @@ proc pArg(arg: PNode; c: var Con; isSink: bool): PNode =
var branch: PNode var branch: PNode
if arg[i].kind == nkOfbranch: if arg[i].kind == nkOfbranch:
branch = arg[i] # of branch conditions are constants branch = arg[i] # of branch conditions are constants
branch[^1] = pArg(arg[i][^1], c, isSink) branch[^1] = pArgIfTyped(arg[i][^1])
elif arg[i].kind in {nkElifBranch, nkElifExpr}: elif arg[i].kind in {nkElifBranch, nkElifExpr}:
branch = copyNode(arg[i]) branch = copyNode(arg[i])
branch.add p(arg[i][0], c) branch.add p(arg[i][0], c)
branch.add pArg(arg[i][1], c, isSink) branch.add pArgIfTyped(arg[i][1])
else: else:
branch = copyNode(arg[i]) branch = copyNode(arg[i])
branch.add pArg(arg[i][0], c, isSink) branch.add pArgIfTyped(arg[i][0])
result.add branch result.add branch
else: else:
# an object that is not temporary but passed to a 'sink' parameter # an object that is not temporary but passed to a 'sink' parameter
@ -474,11 +476,12 @@ proc pArg(arg: PNode; c: var Con; isSink: bool): PNode =
result = p(arg, c) result = p(arg, c)
proc moveOrCopy(dest, ri: PNode; c: var Con): PNode = proc moveOrCopy(dest, ri: PNode; c: var Con): PNode =
if ri.typ == nil: template moveOrCopyIfTyped(ri_part: PNode): PNode =
# typ is nil if we are in if/case branch with noreturn # typ is nil if we are in if/case expr branch with noreturn
result = copyTree(ri) if ri_part.typ == nil: copyTree(ri_part)
else: else: moveOrCopy(dest, ri_part, c)
case ri.kind
case ri.kind
of nkCallKinds: of nkCallKinds:
result = genSink(c, dest.typ, dest, ri) result = genSink(c, dest.typ, dest, ri)
# watch out and no not transform 'ri' twice if it's a call: # watch out and no not transform 'ri' twice if it's a call:
@ -505,18 +508,16 @@ proc moveOrCopy(dest, ri: PNode; c: var Con): PNode =
of nkBlockExpr, nkBlockStmt: of nkBlockExpr, nkBlockStmt:
result = newNodeI(nkBlockStmt, ri.info) result = newNodeI(nkBlockStmt, ri.info)
result.add ri[0] ## add label result.add ri[0] ## add label
for i in 1..ri.len-2: result.add moveOrCopy(dest, ri[1], c)
result.add p(ri[i], c)
result.add moveOrCopy(dest, ri[^1], c)
of nkIfExpr, nkIfStmt: of nkIfExpr, nkIfStmt:
result = newNodeI(nkIfStmt, ri.info) result = newNodeI(nkIfStmt, ri.info)
for i in 0..<ri.len: for i in 0..<ri.len:
var branch = copyNode(ri[i]) var branch = copyNode(ri[i])
if ri[i].kind in {nkElifBranch, nkElifExpr}: if ri[i].kind in {nkElifBranch, nkElifExpr}:
branch.add p(ri[i][0], c) branch.add p(ri[i][0], c)
branch.add moveOrCopy(dest, ri[i][1], c) branch.add moveOrCopyIfTyped(ri[i][1])
else: else:
branch.add moveOrCopy(dest, ri[i][0], c) branch.add moveOrCopyIfTyped(ri[i][0])
result.add branch result.add branch
of nkCaseStmt: of nkCaseStmt:
result = newNodeI(nkCaseStmt, ri.info) result = newNodeI(nkCaseStmt, ri.info)
@ -525,14 +526,14 @@ proc moveOrCopy(dest, ri: PNode; c: var Con): PNode =
var branch: PNode var branch: PNode
if ri[i].kind == nkOfbranch: if ri[i].kind == nkOfbranch:
branch = ri[i] # of branch conditions are constants branch = ri[i] # of branch conditions are constants
branch[^1] = moveOrCopy(dest, ri[i][^1], c) branch[^1] = moveOrCopyIfTyped(ri[i][^1])
elif ri[i].kind in {nkElifBranch, nkElifExpr}: elif ri[i].kind in {nkElifBranch, nkElifExpr}:
branch = copyNode(ri[i]) branch = copyNode(ri[i])
branch.add p(ri[i][0], c) branch.add p(ri[i][0], c)
branch.add moveOrCopy(dest, ri[i][1], c) branch.add moveOrCopyIfTyped(ri[i][1])
else: else:
branch = copyNode(ri[i]) branch = copyNode(ri[i])
branch.add moveOrCopy(dest, ri[i][0], c) branch.add moveOrCopyIfTyped(ri[i][0])
result.add branch result.add branch
of nkObjConstr: of nkObjConstr:
result = genSink(c, dest.typ, dest, ri) result = genSink(c, dest.typ, dest, ri)