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

Fixes #13186 (#13188)

Browse source
This commit is contained in:
slangmgh 2020-01-19 21:16:50 +08:00 • committed by Andreas Rumpf
commit 13ddbc46fc
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/ccgstmts.nim
View file

@ -1041,7 +1041,8 @@ proc genTryGoto(p: BProc; t: PNode; d: var TLoc) =
p.nestedTryStmts.add((fin, false, Natural lab)) p.nestedTryStmts.add((fin, false, Natural lab))
p.flags.incl nimErrorFlagAccessed p.flags.incl nimErrorFlagAccessed
linefmt(p, cpsStmts, "NI oldNimErr$1_ = *nimErr_; *nimErr_ = 0;;$n", [lab]) p.procSec(cpsLocals).add(ropecg(p.module, "NI oldNimErr$1_;$n", [lab]))
linefmt(p, cpsStmts, "oldNimErr$1_ = *nimErr_; *nimErr_ = 0;;$n", [lab])
expr(p, t[0], d) expr(p, t[0], d)
@ -1104,7 +1105,8 @@ proc genTryGoto(p: BProc; t: PNode; d: var TLoc) =
genStmts(p, t[i][0]) genStmts(p, t[i][0])
else: else:
# pretend we did handle the error for the safe execution of the 'finally' section: # pretend we did handle the error for the safe execution of the 'finally' section:
linefmt(p, cpsStmts, "NI oldNimErrFin$1_ = *nimErr_; *nimErr_ = 0;$n", [lab]) p.procSec(cpsLocals).add(ropecg(p.module, "NI oldNimErrFin$1_;$n", [lab]))
linefmt(p, cpsStmts, "oldNimErrFin$1_ = *nimErr_; *nimErr_ = 0;$n", [lab])
genStmts(p, t[i][0]) genStmts(p, t[i][0])
# this is correct for all these cases: # this is correct for all these cases:
# 1. finally is run during ordinary control flow # 1. finally is run during ordinary control flow