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

fixes #15325 (#15340)

Browse source
This commit is contained in:
Andreas Rumpf 2020-09-16 17:26:13 +02:00 • committed by GitHub
commit ae4ede6b00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 144 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/varpartitions.nim
View file

@ -392,9 +392,18 @@ proc deps(c: var Partitions; dest, src: PNode) =
analyseAsgn(c, c.s[vid], src)
# do not borrow from a different local variable, this is easier
# than tracking reassignments, consider 'var cursor = local; local = newNode()'
if src.kind == nkSym and (src.sym.kind in {skVar, skResult, skTemp} or
if src.kind == nkSym:
if (src.sym.kind in {skVar, skResult, skTemp} or
(src.sym.kind in {skLet, skParam, skForVar} and hasDisabledAsgn(src.sym.typ))):
c.s[vid].flags.incl preventCursor
c.s[vid].flags.incl preventCursor
elif src.sym.kind in {skVar, skResult, skTemp, skLet, skForVar}:
# XXX: we need to compute variable alive ranges before doing anything else:
let srcid = variableId(c, src.sym)
if srcid >= 0 and preventCursor in c.s[srcid].flags:
# you cannot borrow from a local that lives shorter than 'vid':
if c.s[srcid].aliveStart > c.s[vid].aliveStart or
c.s[srcid].aliveEnd < c.s[vid].aliveEnd:
c.s[vid].flags.incl preventCursor
if src.kind == nkSym and hasDestructor(src.typ):
rhsIsSink(c, src)