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

Fixes #5034 illformed AST from getImpl with proc returning value (#17976)

Browse source 
* Fixes 5034

* address comments
This commit is contained in:
Dylan Modesitt 2021-05-31 16:51:32 -04:00 • committed by GitHub
commit 06d50bfd4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
compiler/semstmts.nim
View file

@ -1439,16 +1439,33 @@ proc semBorrow(c: PContext, n: PNode, s: PSym) =
else:
localError(c.config, n.info, errNoSymbolToBorrowFromFound)
proc swapResult(n: PNode, sRes: PSym, dNode: PNode) =
## Swap nodes that are (skResult) symbols to d(estination)Node.
for i in 0..<n.safeLen:
if n[i].kind == nkSym and n[i].sym == sRes:
n[i] = dNode
swapResult(n[i], sRes, dNode)
proc addResult(c: PContext, n: PNode, t: PType, owner: TSymKind) =
template genResSym(s) =
var s = newSym(skResult, getIdent(c.cache, "result"), nextSymId c.idgen,
getCurrOwner(c), n.info)
s.typ = t
incl(s.flags, sfUsed)
if owner == skMacro or t != nil:
if n.len > resultPos and n[resultPos] != nil:
if n[resultPos].sym.kind != skResult or n[resultPos].sym.owner != getCurrOwner(c):
if n[resultPos].sym.kind != skResult:
localError(c.config, n.info, "incorrect result proc symbol")
if n[resultPos].sym.owner != getCurrOwner(c):
# re-write result with new ownership, and re-write the proc accordingly
let sResSym = n[resultPos].sym
genResSym(s)
n[resultPos] = newSymNode(s)
swapResult(n, sResSym, n[resultPos])
c.p.resultSym = n[resultPos].sym
else:
var s = newSym(skResult, getIdent(c.cache, "result"), nextSymId c.idgen, getCurrOwner(c), n.info)
s.typ = t
incl(s.flags, sfUsed)
genResSym(s)
c.p.resultSym = s
n.add newSymNode(c.p.resultSym)
addParamOrResult(c, c.p.resultSym, owner)