From 322433755058eae481f4e92b2070e886f097bd9f Mon Sep 17 00:00:00 2001
From: metagn <metagngn@gmail.com>
Date: Thu, 18 Jan 2024 16:50:36 +0300
Subject: [PATCH] give typedesc param nodes type T not typedesc[T]
 [backport:2.0] (#23115)

fixes https://github.com/nim-lang/Nim/issues/23112, fixes a mistake in
https://github.com/nim-lang/Nim/pull/22581

This makes `getType(t)` where `t` is a typedesc param with value `T`
equal to `getType(T)`.
---
 compiler/vmgen.nim     |  2 +-
 tests/vm/ttypedesc.nim | 13 +++++++++++++
 tests/vm/tvmmisc.nim   |  3 +--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/compiler/vmgen.nim b/compiler/vmgen.nim
index 9bbea2b08e..b7dd193be6 100644
--- a/compiler/vmgen.nim
+++ b/compiler/vmgen.nim
@@ -2124,7 +2124,7 @@ proc gen(c: PCtx; n: PNode; dest: var TDest; flags: TGenFlags = {}) =
       genRdVar(c, n, dest, flags)
     of skParam:
       if s.typ.kind == tyTypeDesc:
-        genTypeLit(c, s.typ, dest)
+        genTypeLit(c, s.typ.skipTypes({tyTypeDesc}), dest)
       else:
         genRdVar(c, n, dest, flags)
     of skProc, skFunc, skConverter, skMacro, skTemplate, skMethod, skIterator:
diff --git a/tests/vm/ttypedesc.nim b/tests/vm/ttypedesc.nim
index a112584c54..d799e5adb0 100644
--- a/tests/vm/ttypedesc.nim
+++ b/tests/vm/ttypedesc.nim
@@ -16,3 +16,16 @@ block: # issue #15760
 
   doAssert x[SpecialBanana]() == "SpecialBanana"
   doAssert y(SpecialBanana) == "SpecialBanana"
+
+import macros
+
+block: # issue #23112
+  type Container = object
+    foo: string
+
+  proc canBeImplicit(t: typedesc) {.compileTime.} =
+    let tDesc = getType(t)
+    doAssert tDesc.kind == nnkObjectTy
+
+  static:
+    canBeImplicit(Container)
diff --git a/tests/vm/tvmmisc.nim b/tests/vm/tvmmisc.nim
index cade68577c..f277c20d8b 100644
--- a/tests/vm/tvmmisc.nim
+++ b/tests/vm/tvmmisc.nim
@@ -4,8 +4,7 @@ import os
 # bug #4462
 block:
   proc foo(t: typedesc) {.compileTime.} =
-    assert sameType(getType(t), getType(typedesc[int]))
-    assert sameType(getType(t), getType(type int))
+    assert sameType(getType(t), getType(int))
 
   static:
     foo(int)