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

fixes #6960

Browse source
This commit is contained in:
Andreas Rumpf 2018-02-11 13:55:56 +01:00
commit 358709e9cb
3 changed files with 34 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/ccgcalls.nim
View file

@ -32,7 +32,7 @@ proc fixupCall(p: BProc, le, ri: PNode, d: var TLoc,
if d.k == locNone: getTemp(p, typ.sons[0], d, needsInit=true)
elif d.k notin {locTemp} and not hasNoInit(ri):
# reset before pass as 'result' var:
resetLoc(p, d)
discard "resetLoc(p, d)"
add(pl, addrLoc(d))
add(pl, ~");$n")
line(p, cpsStmts, pl)
@ -228,7 +228,7 @@ proc genClosureCall(p: BProc, le, ri: PNode, d: var TLoc) =
getTemp(p, typ.sons[0], d, needsInit=true)
elif d.k notin {locTemp} and not hasNoInit(ri):
# reset before pass as 'result' var:
resetLoc(p, d)
discard "resetLoc(p, d)"
add(pl, addrLoc(d))
genCallPattern()
else:

1
compiler/cgen.nim
View file

@ -726,6 +726,7 @@ proc genProcAux(m: BModule, prc: PSym) =
else:
fillResult(resNode)
assignParam(p, res)
resetLoc(p, res.loc)
if skipTypes(res.typ, abstractInst).kind == tyArray:
#incl(res.loc.flags, lfIndirect)
res.loc.storage = OnUnknown