require untyped macros/templates to match before early expansion in g…

…enerics

fixes #22740

compiler/semgnrc.nim

@@ -298,13 +298,20 @@ proc semGenericStmt(c: PContext, n: PNode,
         # unambiguous macros/templates are expanded if all params are untyped
         if sfAllUntyped in s.flags and sc.safeLen <= 1:
           onUse(fn.info, s)
-          case s.kind
-          of skMacro: result = semMacroExpr(c, n, n, s, {efNoSemCheck})
-          of skTemplate: result = semTemplateExpr(c, n, s, {efNoSemCheck})
-          else: discard # unreachable
-          c.friendModules.add(s.owner.getModule)
-          result = semGenericStmt(c, result, flags, ctx)
-          discard c.friendModules.pop()
+          var errors: CandidateErrors
+          var r = resolveOverloads(c, n, n, {skTemplate, skMacro}, {efNoDiagnostics},
+                                   errors, false)
+          if r.state == csMatch:
+            case s.kind
+            of skMacro: result = semMacroExpr(c, n, n, s, {efNoSemCheck})
+            of skTemplate: result = semTemplateExpr(c, n, s, {efNoSemCheck})
+            else: discard # unreachable
+            c.friendModules.add(s.owner.getModule)
+            result = semGenericStmt(c, result, flags, ctx)
+            discard c.friendModules.pop()
+          else:
+            n[0] = sc
+            result = n
         else:
           n[0] = sc
           result = n

tests/generics/tuntypedmacro.nim

@@ -0,0 +1,21 @@
+block: # issue #22740
+  macro foo(n: untyped): untyped = discard
+  # Remove this macro to fix the problem
+  macro foo(n, n2: untyped): untyped = discard
+
+  # This one is fine
+  proc test1(v: string) =
+    foo >"test1"
+
+  # This one fails to compile
+  proc test2[T](v: T) = 
+    foo >"test2"
+
+  test1("hello")
+  test2("hello")
+
+block: # above simplified (yes this errored)
+  proc foo[T]() =
+    when false:
+      >1
+  foo[int]()