Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #13186 #13188

Merged
merged 12 commits into from
Jan 19, 2020
Merged

Fix #13186 #13188

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
13410b4
Merge pull request #1 from nim-lang/devel
slangmgh Jun 6, 2018
1e3483b
Merge pull request #2 from nim-lang/devel
slangmgh Jan 22, 2019
e56b9df
Fix #10352
slangmgh Jan 22, 2019
41dacf8
merge cgen
slangmgh Jan 27, 2019
cb78774
Merge remote-tracking branch 'main/devel' into devel
slangmgh Jan 27, 2019
c97d27f
move the module init code together
slangmgh Jan 27, 2019
97c054b
Merge remote-tracking branch 'main/devel' into devel
slangmgh Jan 28, 2019
ab283b4
Merge remote-tracking branch 'main/devel' into devel
slangmgh Jan 29, 2019
470f4fe
Merge branch 'devel' of git://github.com/nim-lang/Nim into devel
slangmgh Feb 20, 2019
c39b85b
Merge pull request #3 from nim-lang/devel
slangmgh Jan 18, 2020
e316ce3
fix #13186 in ccgstmts
slangmgh Jan 18, 2020
1369178
fix #13186 in ccgstmts
slangmgh Jan 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions compiler/ccgstmts.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,8 @@ proc genTryGoto(p: BProc; t: PNode; d: var TLoc) =
p.nestedTryStmts.add((fin, false, Natural lab))

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)

Expand Down Expand Up @@ -1104,7 +1105,8 @@ proc genTryGoto(p: BProc; t: PNode; d: var TLoc) =
genStmts(p, t[i][0])
else:
# 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])
# this is correct for all these cases:
# 1. finally is run during ordinary control flow
Expand Down