diff options
| author | Jacek Sieka <arnetheduck@gmail.com> | 2019-08-28 12:08:54 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2019-08-28 12:08:54 +0200 |
| commit | 42d2e68bca2d7fce65591ed7c4697ed1ecf86026 (patch) | |
| tree | 30fb608a32b1605e0db9908246fabfa7c08ad162 | |
| parent | c9f49cbc0a9314585ca70b3365e49ab82dfdcc13 (diff) | |
| download | Nim-42d2e68bca2d7fce65591ed7c4697ed1ecf86026.tar.gz | |
only store finally block in exception stack (#11876)
| -rw-r--r-- | compiler/ccgstmts.nim | 20 | ||||
| -rw-r--r-- | compiler/cgendata.nim | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/compiler/ccgstmts.nim b/compiler/ccgstmts.nim index 337b36904..bfd053f2d 100644 --- a/compiler/ccgstmts.nim +++ b/compiler/ccgstmts.nim @@ -199,7 +199,7 @@ proc blockLeaveActions(p: BProc, howManyTrys, howManyExcepts: int) = # Called by return and break stmts. # Deals with issues faced when jumping out of try/except/finally stmts, - var stack = newSeq[tuple[n: PNode, inExcept: bool]](0) + var stack = newSeq[tuple[fin: PNode, inExcept: bool]](0) for i in 1 .. howManyTrys: let tryStmt = p.nestedTryStmts.pop @@ -214,9 +214,9 @@ proc blockLeaveActions(p: BProc, howManyTrys, howManyExcepts: int) = # Find finally-stmt for this try-stmt # and generate a copy of its sons - var finallyStmt = lastSon(tryStmt.n) - if finallyStmt.kind == nkFinally: - genStmts(p, finallyStmt.sons[0]) + var finallyStmt = tryStmt.fin + if finallyStmt != nil: + genStmts(p, finallyStmt[0]) # push old elements again: for i in countdown(howManyTrys-1, 0): @@ -675,8 +675,8 @@ proc genRaiseStmt(p: BProc, t: PNode) = if p.nestedTryStmts.len > 0 and p.nestedTryStmts[^1].inExcept: # if the current try stmt have a finally block, # we must execute it before reraising - var finallyBlock = p.nestedTryStmts[^1].n[^1] - if finallyBlock.kind == nkFinally: + let finallyBlock = p.nestedTryStmts[^1].fin + if finallyBlock != nil: genSimpleBlock(p, finallyBlock[0]) if t[0].kind != nkEmpty: var a: TLoc @@ -924,7 +924,8 @@ proc genTryCpp(p: BProc, t: PNode, d: var TLoc) = getTemp(p, t.typ, d) genLineDir(p, t) discard cgsym(p.module, "popCurrentExceptionEx") - add(p.nestedTryStmts, (t, false)) + let fin = if t[^1].kind == nkFinally: t[^1] else: nil + add(p.nestedTryStmts, (fin, false)) startBlock(p, "try {$n") expr(p, t[0], d) endBlock(p) @@ -1021,8 +1022,9 @@ proc genTry(p: BProc, t: PNode, d: var TLoc) = else: linefmt(p, cpsStmts, "$1.status = setjmp($1.context);$n", [safePoint]) startBlock(p, "if ($1.status == 0) {$n", [safePoint]) - var length = sonsLen(t) - add(p.nestedTryStmts, (t, quirkyExceptions)) + let length = sonsLen(t) + let fin = if t[^1].kind == nkFinally: t[^1] else: nil + add(p.nestedTryStmts, (fin, quirkyExceptions)) expr(p, t.sons[0], d) if not quirkyExceptions: linefmt(p, cpsStmts, "#popSafePoint();$n", []) diff --git a/compiler/cgendata.nim b/compiler/cgendata.nim index bd35f2b87..47b0f23ec 100644 --- a/compiler/cgendata.nim +++ b/compiler/cgendata.nim @@ -73,7 +73,7 @@ type noSafePoints*: bool # the proc doesn't use safe points in exception handling lastLineInfo*: TLineInfo # to avoid generating excessive 'nimln' statements currLineInfo*: TLineInfo # AST codegen will make this superfluous - nestedTryStmts*: seq[tuple[n: PNode, inExcept: bool]] + nestedTryStmts*: seq[tuple[fin: PNode, inExcept: bool]] # in how many nested try statements we are # (the vars must be volatile then) # bool is true when are in the except part of a try block |