diff options
author | Andreas Rumpf <rumpf_a@web.de> | 2021-05-12 07:15:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-12 07:15:05 +0200 |
commit | 39ad9a69a9473aa88d4457039393f6ed15fafcfa (patch) | |
tree | 44922aeb7d99f8f2b1df47b70468b8e3ac3d595b /compiler/liftdestructors.nim | |
parent | 1e080eb9b4e0759b8b3f87406cd58bb7a615902f (diff) | |
download | Nim-39ad9a69a9473aa88d4457039393f6ed15fafcfa.tar.gz |
ORC: improvements (#17993)
* ORC: improvements * ORC: fix .acyclic annotation for ref objects
Diffstat (limited to 'compiler/liftdestructors.nim')
-rw-r--r-- | compiler/liftdestructors.nim | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/compiler/liftdestructors.nim b/compiler/liftdestructors.nim index 1dc711bd6..de45beb52 100644 --- a/compiler/liftdestructors.nim +++ b/compiler/liftdestructors.nim @@ -480,13 +480,17 @@ proc setLenSeqCall(c: var TLiftCtx; t: PType; x, y: PNode): PNode = result = newTree(nkCall, newSymNode(op, x.info), x, lenCall) proc forallElements(c: var TLiftCtx; t: PType; body, x, y: PNode) = + let counterIdx = body.len let i = declareCounter(c, body, toInt64(firstOrd(c.g.config, t))) let whileLoop = genWhileLoop(c, i, x) let elemType = t.lastSon let b = if c.kind == attachedTrace: y else: y.at(i, elemType) fillBody(c, elemType, whileLoop[1], x.at(i, elemType), b) - addIncStmt(c, whileLoop[1], i) - body.add whileLoop + if whileLoop[1].len > 0: + addIncStmt(c, whileLoop[1], i) + body.add whileLoop + else: + body.sons.setLen counterIdx proc fillSeqOp(c: var TLiftCtx; t: PType; body, x, y: PNode) = case c.kind @@ -660,6 +664,7 @@ proc atomicRefOp(c: var TLiftCtx; t: PType; body, x, y: PNode) = else: # If the ref is polymorphic we have to account for this body.add callCodegenProc(c.g, "nimTraceRefDyn", c.info, genAddrOf(x, c.idgen), y) + #echo "can follow ", elemType, " static ", isFinal(elemType) of attachedDispose: # this is crucial! dispose is like =destroy but we don't follow refs # as that is dealt within the cycle collector. |