From 0fc1b79b750c61285a1842e25503968d9c5314d6 Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Sat, 24 Dec 2022 17:37:32 +0800
Subject: [PATCH] enforce void for nkWhileStmt [backport: 2.0] (#21170)

enforce void for nkWhileStmt

(cherry picked from commit 9323cb7b2a761543df9d875c05f4963c1a8b050f)
---
 compiler/semstmts.nim          |  1 -
 tests/discard/tdiscardable.nim | 11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index d47c1879601c..87738a5d844f 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -100,7 +100,6 @@ proc semWhile(c: PContext, n: PNode; flags: TExprFlags): PNode =
     result.typ = n[1].typ
   elif implicitlyDiscardable(n[1]):
     result[1].typ = c.enforceVoidContext
-    result.typ = c.enforceVoidContext
 
 proc semProc(c: PContext, n: PNode): PNode
 
diff --git a/tests/discard/tdiscardable.nim b/tests/discard/tdiscardable.nim
index b13130a13e85..69cb9f6a195f 100644
--- a/tests/discard/tdiscardable.nim
+++ b/tests/discard/tdiscardable.nim
@@ -99,3 +99,14 @@ block: # bug #13583
     let t = test
     doAssert t() == 12
 
+block:
+  proc bar(): string {.discardable.} =
+    "15"
+
+  proc foo(): int =
+    while true:
+      raise newException(ValueError, "check")
+    12
+
+  doAssertRaises(ValueError):
+    doAssert foo() == 12