From d1112d4b5f898dc5cfd9d189fcceabbd2ab3c582 Mon Sep 17 00:00:00 2001
From: metagn <metagngn@gmail.com>
Date: Tue, 21 Jan 2025 21:03:55 +0300
Subject: [PATCH] just ignore in transf, fix cast too

---
 compiler/semobjconstr.nim            |  3 +--
 compiler/transf.nim                  | 10 ++++++++++
 tests/template/tgenericobjconstr.nim |  7 +++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/compiler/semobjconstr.nim b/compiler/semobjconstr.nim
index 05d3c625c7a64..b2dfc36b16a5d 100644
--- a/compiler/semobjconstr.nim
+++ b/compiler/semobjconstr.nim
@@ -459,8 +459,7 @@ proc defaultConstructionError(c: PContext, t: PType, info: TLineInfo) =
 proc semObjConstr(c: PContext, n: PNode, flags: TExprFlags; expectedType: PType = nil): PNode =
   var t = semTypeNode(c, n[0], nil)
   result = newNodeIT(nkObjConstr, n.info, t)
-  result.add newNodeIT(nkType, n[0].info, t)
-  for i in 1..<n.len:
+  for i in 0..<n.len:
     result.add n[i]
 
   if t == nil:
diff --git a/compiler/transf.nim b/compiler/transf.nim
index 5cf43e6a3f580..1cb8d10645cc4 100644
--- a/compiler/transf.nim
+++ b/compiler/transf.nim
@@ -106,6 +106,13 @@ proc transformSons(c: PTransf, n: PNode, noConstFold = false): PNode =
   for i in 0..<n.len:
     result[i] = transform(c, n[i], noConstFold)
 
+proc transformSonsAfterType(c: PTransf, n: PNode, noConstFold = false): PNode =
+  result = newTransNode(n)
+  assert n.len != 0
+  result[0] = n[0]
+  for i in 1..<n.len:
+    result[i] = transform(c, n[i], noConstFold)
+
 proc newAsgnStmt(c: PTransf, kind: TNodeKind, le: PNode, ri: PNode; isFirstWrite: bool): PNode =
   result = newTransNode(kind, ri.info, 2)
   result[0] = le
@@ -1102,6 +1109,9 @@ proc transform(c: PTransf, n: PNode, noConstFold = false): PNode =
       result = transformAddrDeref(c, n, {nkAddr, nkHiddenAddr})
   of nkHiddenStdConv, nkHiddenSubConv, nkConv:
     result = transformConv(c, n)
+  of nkObjConstr, nkCast:
+    # don't try to transform type node
+    result = transformSonsAfterType(c, n)
   of nkDiscardStmt:
     result = n
     if n[0].kind != nkEmpty:
diff --git a/tests/template/tgenericobjconstr.nim b/tests/template/tgenericobjconstr.nim
index ec208983cf0c9..753f4756e5336 100644
--- a/tests/template/tgenericobjconstr.nim
+++ b/tests/template/tgenericobjconstr.nim
@@ -1,3 +1,7 @@
+discard """
+  matrix: "--skipParentCfg"
+"""
+
 # issue #24631
 
 type
@@ -6,3 +10,6 @@ type
 
 template y(): V[false] = V[false](l: 0)
 discard y()
+
+template z(): V[false] = cast[V[false]](V[false](l: 0))
+discard z()