From 911a65198475e53fe6f874564223855174a8df8f Mon Sep 17 00:00:00 2001
From: Miran <narimiran@disroot.org>
Date: Tue, 15 Jul 2025 11:06:18 +0200
Subject: [PATCH] Backport #25016 (#25053)

This is a `version-2-2` variant of the existing fix.

---------

Co-authored-by: ringabout <43030857+ringabout@users.noreply.github.com>
---
 compiler/cgen.nim         | 22 +++++++++++++++-------
 tests/global/tglobal3.nim | 14 ++++++++++++++
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/compiler/cgen.nim b/compiler/cgen.nim
index 05c63c4680..9de707d5c6 100644
--- a/compiler/cgen.nim
+++ b/compiler/cgen.nim
@@ -2170,6 +2170,20 @@ 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 = ""
+
+    # 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
+
 proc genTopLevelStmt*(m: BModule; n: PNode) =
   ## Also called from `ic/cbackend.nim`.
   if pipelineutils.skipCodegen(m.config, n): return
@@ -2185,13 +2199,7 @@ proc genTopLevelStmt*(m: BModule; n: PNode) =
   else:
     genProcBody(m.initProc, transformedN)
 
-  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())
+  handleProcGlobals(m)
 
 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 e0f0d50ce0..80c1cd640d 100644
--- a/tests/global/tglobal3.nim
+++ b/tests/global/tglobal3.nim
@@ -41,3 +41,17 @@ 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)