From 106cde1ff8f63f092f6a4fe3434161806075211a Mon Sep 17 00:00:00 2001
From: metagn <metagngn@gmail.com>
Date: Fri, 1 Sep 2023 16:37:16 +0300
Subject: [PATCH] unify explicit generic param semchecking in calls (#22618)

fixes #9040

(cherry picked from commit 6738f44af3866e4cace94d34b653acf3283f0cde)
---
 compiler/semcall.nim                      |  8 ++++++--
 compiler/semexprs.nim                     |  4 ----
 tests/generics/timplicit_and_explicit.nim | 21 ++++++++++++++++++++-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/compiler/semcall.nim b/compiler/semcall.nim
index 7b1abec6a81e4..2466277821725 100644
--- a/compiler/semcall.nim
+++ b/compiler/semcall.nim
@@ -660,14 +660,18 @@ proc explicitGenericSym(c: PContext, n: PNode, s: PSym): PNode =
   onUse(info, s)
   result = newSymNode(newInst, info)
 
-proc explicitGenericInstantiation(c: PContext, n: PNode, s: PSym): PNode =
-  assert n.kind == nkBracketExpr
+proc setGenericParams(c: PContext, n: PNode) =
+  ## sems generic params in subscript expression
   for i in 1..<n.len:
     let e = semExprWithType(c, n[i])
     if e.typ == nil:
       n[i].typ = errorType(c)
     else:
       n[i].typ = e.typ.skipTypes({tyTypeDesc})
+
+proc explicitGenericInstantiation(c: PContext, n: PNode, s: PSym): PNode =
+  assert n.kind == nkBracketExpr
+  setGenericParams(c, n)
   var s = s
   var a = n[0]
   if a.kind == nkSym:
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index ba06e349c9596..c186b668e8717 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -946,10 +946,6 @@ proc bracketedMacro(n: PNode): PSym =
     if result.kind notin {skMacro, skTemplate}:
       result = nil
 
-proc setGenericParams(c: PContext, n: PNode) =
-  for i in 1..<n.len:
-    n[i].typ = semTypeNode(c, n[i], nil)
-
 proc afterCallActions(c: PContext; n, orig: PNode, flags: TExprFlags; expectedType: PType = nil): PNode =
   if efNoSemCheck notin flags and n.typ != nil and n.typ.kind == tyError:
     return errorNode(c, n)
diff --git a/tests/generics/timplicit_and_explicit.nim b/tests/generics/timplicit_and_explicit.nim
index ba24b79e9c3f7..fe61004e4cb4f 100644
--- a/tests/generics/timplicit_and_explicit.nim
+++ b/tests/generics/timplicit_and_explicit.nim
@@ -42,4 +42,23 @@ block: #4688
 
 block: #4164
   proc printStr[T](s: static[string]): T = discard
-  discard printStr[int]("hello static")
\ No newline at end of file
+  discard printStr[int]("hello static")
+
+import macros
+
+block: # issue #9040, statics with template, macro, symchoice explicit generics
+  block: # macro
+    macro fun[N: static int](): untyped =
+      newLit 1
+    const a = fun[2]()
+    doAssert a == 1
+  block: # template
+    template fun[N: static int](): untyped =
+      1
+    const a = fun[2]()
+    doAssert a == 1
+  block: # symchoice
+    proc newSeq[x: static int](): int = 1
+    template foo: int =
+      newSeq[2]()
+    doAssert foo() == 1