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

Revert "fix arc global variable issues" (#20764)

Browse source 
* Revert "fix arc global variable issues (#20759)"

This reverts commit a3d32a4176.

* trigger documentation builds
This commit is contained in:
ringabout 2022-11-05 22:47:12 +08:00 • committed by GitHub
commit afd4e22f76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/injectdestructors.nim
View file

@ -490,11 +490,8 @@ proc pVarTopLevel(v: PNode; c: var Con; s: var Scope; res: PNode) =
res.add newTree(nkFastAsgn, v, genDefaultCall(v.typ, c, v.info))
elif sfThread notin v.sym.flags and sfCursor notin v.sym.flags:
# do not destroy thread vars for now at all for consistency.
if sfGlobal in v.sym.flags: #XXX: Rethink this logic (see tarcmisc.test2)
if c.inLoop > 0:
s.final.add c.genDestroy(v)
else:
c.graph.globalDestructors.add c.genDestroy(v)
if sfGlobal in v.sym.flags and s.parent == nil: #XXX: Rethink this logic (see tarcmisc.test2)
c.graph.globalDestructors.add c.genDestroy(v)
else:
s.final.add c.genDestroy(v)