ok

Author: yglukhov

compiler/closureiters.nim

@@ -916,19 +916,22 @@ proc transformBreakStmt(ctx: var Ctx, n: PNode): PNode =
   let targetName = if n[0].kind == nkSym: n[0].sym else: nil
   var finallyChain = newSeq[PNode]()
 
+  var targetFound = false
   for i in countdown(ctx.finallyPathStack.high, 0):
     let b = ctx.finallyPathStack[i].n
     # echo "STACK ", i, " ", b.kind
     if b.kind == nkBlockStmt and targetName != nil and b[0].sym == targetName:
       finallyChain.add(ctx.finallyPathStack[i].exitLabel)
+      targetFound = true
       break
     elif b.kind == nkWhileStmt and targetName == nil:
       finallyChain.add(ctx.finallyPathStack[i].exitLabel)
+      targetFound = true
       break
     elif b.kind == nkFinally:
       finallyChain.add(ctx.finallyPathStack[i].enterLabel)
 
-  if finallyChain.len > 0:
+  if targetFound and finallyChain.len > 0:
     result = ctx.newJumpAlongFinallyChain(finallyChain, n.info)
   else:
     result = n

tests/iter/tyieldintry.nim

@@ -667,3 +667,24 @@ block: #21235
   except ValueError:
     ok = true
   doAssert(ok)
+
+block: # break in for without yield in try
+  iterator it(): int {.closure.} =
+    try:
+      block:
+        checkpoint(1)
+        for i in 0 .. 10:
+          checkpoint(2)
+          break
+        checkpoint(3)
+
+      try:
+        yield 4
+      except:
+        checkpoint(123)
+    except:
+      discard
+    finally:
+      checkpoint(5)
+
+  test(it, 1, 2, 3, 4, 5)