From ea51ca8d25fbd716a635887d03789da8cafe4cb1 Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Tue, 6 May 2025 15:46:18 +0800
Subject: [PATCH] fixes #21975; Pragma block disabling warning has effect
 beyond block (#24934)

fixes  #21975

(cherry picked from commit 433b725cbb65eb1b66801a251b75b39011c22984)
---
 compiler/semstmts.nim          | 17 +++++++++++++++++
 tests/pragmas/tpragmablock.nim | 11 +++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 tests/pragmas/tpragmablock.nim

diff --git a/compiler/semstmts.nim b/compiler/semstmts.nim
index b5758f7309..8e32589ea3 100644
--- a/compiler/semstmts.nim
+++ b/compiler/semstmts.nim
@@ -2805,9 +2805,24 @@ proc recursiveSetFlag(n: PNode, flag: TNodeFlag) =
     for i in 0..<n.safeLen: recursiveSetFlag(n[i], flag)
     incl(n.flags, flag)
 
+proc enterPragmaBlock(c: PContext): POptionEntry =
+  result = POptionEntry(options: c.config.options,
+    notes: c.config.notes,
+    warningAsErrors: c.config.warningAsErrors,
+    features: c.features)
+
+proc leavePragmaBlock(c: PContext, p: POptionEntry) =
+  c.config.options = p.options
+  c.config.notes = p.notes
+  c.config.warningAsErrors = p.warningAsErrors
+  c.features = p.features
+
 proc semPragmaBlock(c: PContext, n: PNode; expectedType: PType = nil): PNode =
   checkSonsLen(n, 2, c.config)
   let pragmaList = n[0]
+
+  let oldOptionEntry = enterPragmaBlock(c)
+
   pragma(c, nil, pragmaList, exprPragmas, isStatement = true)
 
   var inUncheckedAssignSection = 0
@@ -2832,6 +2847,8 @@ proc semPragmaBlock(c: PContext, n: PNode; expectedType: PType = nil): PNode =
     of wNoRewrite: recursiveSetFlag(result, nfNoRewrite)
     else: discard
 
+  leavePragmaBlock(c, oldOptionEntry)
+
 proc semStaticStmt(c: PContext, n: PNode): PNode =
   #echo "semStaticStmt"
   #writeStackTrace()
diff --git a/tests/pragmas/tpragmablock.nim b/tests/pragmas/tpragmablock.nim
new file mode 100644
index 0000000000..be53816d55
--- /dev/null
+++ b/tests/pragmas/tpragmablock.nim
@@ -0,0 +1,11 @@
+discard """
+  matrix: "--warningaserror:BareExcept"
+"""
+
+{.warning[BareExcept]:on.}:
+  discard
+
+try:
+  echo "Y"
+except:  # warning disabled here
+  discard
\ No newline at end of file