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

newruntime: fixes codegen for closures

Browse source
This commit is contained in:
Araq 2019-04-03 10:10:06 +02:00 • committed by Andreas Rumpf
commit c9c6741cde
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/liftdestructors.nim
View file

@ -373,6 +373,7 @@ proc closureOp(c: var TLiftCtx; t: PType; body, x, y: PNode) =
body.add newAsgnStmt(x, call) body.add newAsgnStmt(x, call)
elif optNimV2 in c.graph.config.globalOptions: elif optNimV2 in c.graph.config.globalOptions:
let xx = genBuiltin(c.graph, mAccessEnv, "accessEnv", x) let xx = genBuiltin(c.graph, mAccessEnv, "accessEnv", x)
xx.typ = getSysType(c.graph, c.info, tyPointer)
case c.kind case c.kind
of attachedSink: of attachedSink:
# we 'nil' y out afterwards so we *need* to take over its reference # we 'nil' y out afterwards so we *need* to take over its reference
@ -389,6 +390,7 @@ proc closureOp(c: var TLiftCtx; t: PType; body, x, y: PNode) =
proc ownedClosureOp(c: var TLiftCtx; t: PType; body, x, y: PNode) = proc ownedClosureOp(c: var TLiftCtx; t: PType; body, x, y: PNode) =
let xx = genBuiltin(c.graph, mAccessEnv, "accessEnv", x) let xx = genBuiltin(c.graph, mAccessEnv, "accessEnv", x)
xx.typ = getSysType(c.graph, c.info, tyPointer)
var actions = newNodeI(nkStmtList, c.info) var actions = newNodeI(nkStmtList, c.info)
let elemType = t.lastSon let elemType = t.lastSon
discard addDestructorCall(c, elemType, newNodeI(nkStmtList, c.info), genDeref(xx)) discard addDestructorCall(c, elemType, newNodeI(nkStmtList, c.info), genDeref(xx))