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

fix #15043 (#16441) [backport:1.4]

Browse source 
* fix #15043

* Trigger build
This commit is contained in:
cooldome 2020-12-27 21:05:33 +02:00 • committed by GitHub
commit fbc8a40c7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/lambdalifting.nim
View file

@ -238,10 +238,11 @@ proc liftingHarmful(conf: ConfigRef; owner: PSym): bool {.inline.} =
result = conf.backend == backendJs and not isCompileTime result = conf.backend == backendJs and not isCompileTime
proc createTypeBoundOpsLL(g: ModuleGraph; refType: PType; info: TLineInfo; idgen: IdGenerator; owner: PSym) = proc createTypeBoundOpsLL(g: ModuleGraph; refType: PType; info: TLineInfo; idgen: IdGenerator; owner: PSym) =
createTypeBoundOps(g, nil, refType.lastSon, info, idgen) if owner.kind != skMacro:
createTypeBoundOps(g, nil, refType, info, idgen) createTypeBoundOps(g, nil, refType.lastSon, info, idgen)
if tfHasAsgn in refType.flags or optSeqDestructors in g.config.globalOptions: createTypeBoundOps(g, nil, refType, info, idgen)
owner.flags.incl sfInjectDestructors if tfHasAsgn in refType.flags or optSeqDestructors in g.config.globalOptions:
owner.flags.incl sfInjectDestructors
proc liftIterSym*(g: ModuleGraph; n: PNode; idgen: IdGenerator; owner: PSym): PNode = proc liftIterSym*(g: ModuleGraph; n: PNode; idgen: IdGenerator; owner: PSym): PNode =
# transforms (iter) to (let env = newClosure[iter](); (iter, env)) # transforms (iter) to (let env = newClosure[iter](); (iter, env))
@ -613,7 +614,8 @@ proc rawClosureCreation(owner: PSym;
let fieldAccess = indirectAccess(env, local, env.info) let fieldAccess = indirectAccess(env, local, env.info)
# add ``env.param = param`` # add ``env.param = param``
result.add(newAsgnStmt(fieldAccess, newSymNode(local), env.info)) result.add(newAsgnStmt(fieldAccess, newSymNode(local), env.info))
createTypeBoundOps(d.graph, nil, fieldAccess.typ, env.info, d.idgen) if owner.kind != skMacro:
createTypeBoundOps(d.graph, nil, fieldAccess.typ, env.info, d.idgen)
if tfHasAsgn in fieldAccess.typ.flags or optSeqDestructors in d.graph.config.globalOptions: if tfHasAsgn in fieldAccess.typ.flags or optSeqDestructors in d.graph.config.globalOptions:
owner.flags.incl sfInjectDestructors owner.flags.incl sfInjectDestructors

16
tests/arc/trepr.nim
View file

@ -71,3 +71,19 @@ proc p2 =
discard repr p2 discard repr p2
#####################################################################
# bug #15043
import macros
macro extract(): untyped =
result = newStmtList()
var x: seq[tuple[node: NimNode]]
proc test(n: NimNode) {.closure.} =
x.add (node: n)
test(parseExpr("discard"))
extract()