From 6316259057ca1603152d229eb2a677452930999a Mon Sep 17 00:00:00 2001
From: ringabout <43030857+ringabout@users.noreply.github.com>
Date: Thu, 14 May 2026 16:18:51 +0800
Subject: [PATCH] simplify

---
 compiler/ccgexprs.nim | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/compiler/ccgexprs.nim b/compiler/ccgexprs.nim
index 2eadb07466..7c8effd1d0 100644
--- a/compiler/ccgexprs.nim
+++ b/compiler/ccgexprs.nim
@@ -2815,13 +2815,6 @@ proc genWasMoved(p: BProc; n: PNode) =
     #linefmt(p, cpsStmts, "#nimZeroMem((void*)$1, sizeof($2));$n",
     #  [addrLoc(p.config, a), getTypeDesc(p.module, a.t)])
 
-proc canGenMoveCall(n: PNode): bool =
-  if n[0].kind == nkSym:
-    let moveSym = n[0].sym
-    result = sfFromGeneric in moveSym.flags and moveSym.instantiatedFrom != nil
-  else:
-    result = false
-
 proc genMoveCall(p: BProc; n: PNode; d: var TLoc) =
   n[1] = makeAddr(n[1], p.module.idgen)
   let moveSym = n[0].sym
@@ -2830,21 +2823,6 @@ proc genMoveCall(p: BProc; n: PNode; d: var TLoc) =
   genCall(p, n, d)
   setOwner(moveSym, oldOwner)
 
-proc genWasMovedCall(p: BProc; n: PNode; op: PSym) =
-  var call = newNodeI(nkCall, n.info)
-  call.add newSymNode(op)
-  if op.typ != nil and op.typ.signatureLen > 1 and op.typ.firstParamType.kind != tyVar:
-    call.add n[1].skipAddr
-  else:
-    call.add makeAddr(n[1].skipAddr, p.module.idgen)
-  var noDest = initLoc(locNone, nil, OnUnknown)
-  genCall(p, call, noDest)
-
-proc genMoveWithWasMoved(p: BProc; n: PNode; d: var TLoc; op: PSym) =
-  var a: TLoc = initLocExpr(p, n[1].skipAddr, {lfEnforceDeref, lfPrepareForMutation})
-  genAssignment(p, d, a, {})
-  genWasMovedCall(p, n, op)
-
 proc genMove(p: BProc; n: PNode; d: var TLoc) =
   if n.len == 4:
     # generated by liftdestructors:
@@ -2874,10 +2852,7 @@ proc genMove(p: BProc; n: PNode; d: var TLoc) =
         genAssignment(p, d, a, {})
         resetLoc(p, a)
       else:
-        if canGenMoveCall(n):
-          genMoveCall(p, n, d)
-        else:
-          genMoveWithWasMoved(p, n, d, op)
+        genMoveCall(p, n, d)
     else:
       var a: TLoc = initLocExpr(p, n[1].skipAddr, {lfEnforceDeref, lfPrepareForMutation})
       genAssignment(p, d, a, {})