From 3090d8f54447ce28bf6718d0952e65dff87d5948 Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:08:43 +0800
Subject: [PATCH] patchStackTraceEntry

---
 lib/system.nim             |  3 ---
 lib/system/stacktraces.nim | 30 ++++++++++++------------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/lib/system.nim b/lib/system.nim
index 67714169ea..c7667cfba4 100644
--- a/lib/system.nim
+++ b/lib/system.nim
@@ -553,9 +553,6 @@ type
   CatchableError* = object of Exception ## \
     ## Abstract class for all exceptions that are catchable.
 
-when defined(nimStackTraceOverride):
-  proc `=copy`*(x: var StackTraceEntry, y: StackTraceEntry) {.error.}
-
 when defined(nimIcIntegrityChecks):
   include "system/exceptions"
 
diff --git a/lib/system/stacktraces.nim b/lib/system/stacktraces.nim
index d903f6c2c4..1fed5bc9c5 100644
--- a/lib/system/stacktraces.nim
+++ b/lib/system/stacktraces.nim
@@ -68,22 +68,14 @@ when defined(nimStackTraceOverride):
     for i in 0..<programCounters.len:
       s.add(StackTraceEntry(programCounter: cast[uint](programCounters[i])))
 
-  proc copyStackTraceEntry(x: ptr StackTraceEntry): StackTraceEntry =
-    result = StackTraceEntry(line: x.line, programCounter: x.programCounter,
-                             procnameStr: x.procnameStr, filenameStr: x.filenameStr
-    )
-    when NimStackTraceMsgs:
-      result.frameMsg = x.frameMsg
+  proc patchStackTraceEntry(x: var StackTraceEntry) =
+    x.procname = x.procnameStr.cstring
+    x.filename = x.filenameStr.cstring
 
-    # points `procname`, `filename` to its own corresponding fields
-    # to avoid dangling pointers # bug #25306 18039
-    result.procname = result.procnameStr.cstring
-    result.filename = result.filenameStr.cstring
-
-  proc copyStackTraceEntrySeq(result: var seq[StackTraceEntry]; s: seq[StackTraceEntry]) =
+  proc addStackTraceEntrySeq(result: var seq[StackTraceEntry]; s: seq[StackTraceEntry]) =
     for i in 0..<s.len:
-      let entry = addr s[i]
-      result.add(copyStackTraceEntry entry)
+      result.add(s[i])
+      patchStackTraceEntry(result[result.high])
 
   # We may have more stack trace lines in the output, due to inlined procedures.
   proc addDebuggingInfo*(s: seq[StackTraceEntry]): seq[StackTraceEntry] =
@@ -95,10 +87,12 @@ when defined(nimStackTraceOverride):
       if entry.procname.isNil and entry.programCounter != 0:
         programCounters.add(cast[cuintptr_t](entry.programCounter))
       elif entry.procname.isNil and (entry.line == reraisedFromBegin or entry.line == reraisedFromEnd):
-        result.copyStackTraceEntrySeq(stackTraceOverrideGetDebuggingInfo(programCounters, maxStackTraceLines))
+        result.addStackTraceEntrySeq(stackTraceOverrideGetDebuggingInfo(programCounters, maxStackTraceLines))
         programCounters = @[]
-        result.add(copyStackTraceEntry entry)
+        result.add(entry[])
+        patchStackTraceEntry(result[result.high])
       else:
-        result.add(copyStackTraceEntry entry)
+        result.add(entry[])
+        patchStackTraceEntry(result[result.high])
     if programCounters.len > 0:
-      result.copyStackTraceEntrySeq(stackTraceOverrideGetDebuggingInfo(programCounters, maxStackTraceLines))
+      result.addStackTraceEntrySeq(stackTraceOverrideGetDebuggingInfo(programCounters, maxStackTraceLines))