account for mArrGet/mArrPut not matching generic params

metagn · Oct 4, 2024 · 35c41b0 · 35c41b0
1 parent 4071fe9
commit 35c41b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
@@ -2429,7 +2429,9 @@ proc paramTypesMatchAux(m: var TCandidate, f, a: PType,
       result = arg
     elif skipTypes(arg.typ, abstractVar-{tyTypeDesc}).kind == tyTuple or cmpInheritancePenalty(oldInheritancePenalty, m.inheritancePenalty) > 0:
       result = implicitConv(nkHiddenSubConv, f, arg, m, c)
-    elif arg.typ.isEmptyContainer or arg.typ.isIntLit:
+    elif arg.typ.isEmptyContainer or
+        # mArrGet/mArrPut short circuit and don't bind generic params
+        (arg.typ.isIntLit and m.magic notin {mArrGet, mArrPut}):
       result = arg.copyTree
       result.typ = getInstantiatedType(c, arg, m, f)
     else:

diff --git a/tests/js/tint64litgen.nim b/tests/js/tint64litgen.nim
@@ -22,3 +22,9 @@ block: # issue #24233, modified
 
   let x: int64 = 456
   foo(x, bar)
+
+block:
+  proc foo[I: Ordinal](x: I) = discard
+  foo(123)
+  let x = [0, 1, 2]
+  discard x[0]