From 88f1d4f154e046fe7fa881a4eebb782135d7acd9 Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Fri, 27 Jun 2025 23:17:47 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"fixes=20#24997;=20{.global.}=20variab?=
 =?UTF-8?q?le=20in=20recursive=20function=20(#250=E2=80=A6=20(#25019)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…16)"

This reverts commit 1a2ee566e333b265b5276d69ccfc1508ba56a783.
---
 compiler/cgen.nim         | 22 +++++++---------------
 tests/global/tglobal3.nim | 14 --------------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index ed4e77647d..05c63c4680 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -2170,20 +2170,6 @@ proc addHcrInitGuards(p: BProc, n: PNode, inInitGuard: var bool) =
 
     genStmts(p, n)
 
-proc handleProcGlobals(m: BModule) =
-  var procGlobals: seq[PNode] = move m.g.graph.procGlobals
-
-  for i in 0..<procGlobals.len:
-    var stmts = newBuilder("")
-
-    # fixes recursive calls #24997
-    swap stmts, m.preInitProc.s(cpsStmts)
-    genStmts(m.preInitProc, procGlobals[i])
-    swap stmts, m.preInitProc.s(cpsStmts)
-
-    handleProcGlobals(m)
-    m.preInitProc.s(cpsStmts).add stmts.extract()
-
 proc genTopLevelStmt*(m: BModule; n: PNode) =
   ## Also called from `ic/cbackend.nim`.
   if pipelineutils.skipCodegen(m.config, n): return
@@ -2199,7 +2185,13 @@ proc genTopLevelStmt*(m: BModule; n: PNode) =
   else:
     genProcBody(m.initProc, transformedN)
 
-  handleProcGlobals(m)
+  var procGloals = move m.g.graph.procGlobals
+  while true:
+    if procGloals.len == 0:
+      procGloals = move m.g.graph.procGlobals
+      if procGloals.len == 0:
+        break
+    genStmts(m.preInitProc, procGloals.pop())
 
 proc shouldRecompile(m: BModule; code: Rope, cfile: Cfile): bool =
   if optForceFullMake notin m.config.globalOptions:
diff --git a/tests/global/tglobal3.nim b/tests/global/tglobal3.nim
index 80c1cd640d..e0f0d50ce0 100644
--- a/tests/global/tglobal3.nim
+++ b/tests/global/tglobal3.nim
@@ -41,17 +41,3 @@ block: # bug #24981
   type Foo = object
     i: int
   m(Foo)
-
-block: # bug #24997
-  type R = ref object
-  type B = object
-    j: int
-  proc y(T: type): R
-  proc u(T: type): R =
-    let res {.global.} = y(T)
-    res
-  proc y(T: type): R =
-    when T is object:
-      doAssert not isNil(u(typeof(B.j)))
-    R()
-  discard u(B)