mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-08-10 00:58:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
ringabout
2026-05-14 16:18:51 +08:00
parent 5538a360bf
commit 6316259057
1 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/ccgexprs.nim
View File

@@ -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, {})