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

Fixes 9716 [backport] (#9790)

Browse source 
* reuse temporary variable
* fixes #9716 [backport]
* Declare local vars in safer place
This commit is contained in:
Yuriy Glukhov 2018-11-24 11:50:48 +02:00 • committed by Andreas Rumpf
commit 410fd1deae
4 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/ccgstmts.nim
View file

@ -307,11 +307,13 @@ proc genSingleVar(p: BProc, a: PNode) =
proc genClosureVar(p: BProc, a: PNode) =
var immediateAsgn = a.sons[2].kind != nkEmpty
var v: TLoc
initLocExpr(p, a.sons[0], v)
genLineDir(p, a)
if immediateAsgn:
var v: TLoc
initLocExpr(p, a.sons[0], v)
genLineDir(p, a)
loadInto(p, a.sons[0], a.sons[2], v)
else:
constructLoc(p, v)
proc genVarStmt(p: BProc, n: PNode) =
for it in n.sons:
@ -609,7 +611,7 @@ proc genRaiseStmt(p: BProc, t: PNode) =
lineF(p, cpsStmts, "throw $1;$n", [e])
else:
lineCg(p, cpsStmts, "#raiseExceptionEx((#Exception*)$1, $2, $3, $4, $5);$n",
[e, makeCString(typ.sym.name.s),
[e, makeCString(typ.sym.name.s),
makeCString(if p.prc != nil: p.prc.name.s else: p.module.module.name.s),
makeCString(toFileName(p.config, t.info)), rope(toLinenumber(t.info))])
else: