From c9e77989781d0371f4c19fd8410936acb096a2bf Mon Sep 17 00:00:00 2001
From: flywind <43030857+xflywind@users.noreply.github.com>
Date: Mon, 13 Jun 2022 14:10:40 +0800
Subject: [PATCH] [cleanup] remove unnecessary procs in vm (#19888)

remove unused procs

(cherry picked from commit 2f4900615ab0c42c9608910dd30a14be52455f91)
---
 compiler/vm.nim    | 1 -
 compiler/vmgen.nim | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/compiler/vm.nim b/compiler/vm.nim
index d340c6b9ca..d1c8cbbbb6 100644
--- a/compiler/vm.nim
+++ b/compiler/vm.nim
@@ -2280,7 +2280,6 @@ proc setupMacroParam(x: PNode, typ: PType): TFullReg =
   else:
     var n = x
     if n.kind in {nkHiddenSubConv, nkHiddenStdConv}: n = n[1]
-    n = n.canonValue
     n.flags.incl nfIsRef
     n.typ = x.typ
     result = TFullReg(kind: rkNode, node: n)
diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index 4061567e11..8b403decda 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -441,14 +441,11 @@ proc genAndOr(c: PCtx; n: PNode; opc: TOpcode; dest: var TDest) =
     c.gABC(n, opcAsgnInt, dest, tmp)
     freeTemp(c, tmp)
 
-proc canonValue*(n: PNode): PNode =
-  result = n
-
 proc rawGenLiteral(c: PCtx; n: PNode): int =
   result = c.constants.len
   #assert(n.kind != nkCall)
   n.flags.incl nfAllConst
-  c.constants.add n.canonValue
+  c.constants.add n
   internalAssert c.config, result < regBxMax
 
 proc sameConstant*(a, b: PNode): bool =
@@ -1872,7 +1869,7 @@ proc genVarSection(c: PCtx; n: PNode) =
           else:
             let sa = getNullValue(s.typ, a.info, c.config)
             #if s.ast.isNil: getNullValue(s.typ, a.info)
-            #else: canonValue(s.ast)
+            #else: s.ast
             assert sa.kind != nkCall
             c.globals.add(sa)
             s.position = c.globals.len