diff options
author | metagn <metagngn@gmail.com> | 2024-07-19 05:53:35 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-19 13:53:35 +0200 |
commit | 97f54745459b8651b7a38c174b3a8135224ebd09 (patch) | |
tree | 1eea8c52c77718571dd017eef8f69ebcada032de /compiler/semtypinst.nim | |
parent | 24f5dfbed22322f63d1fc27a07d41f746212a7d3 (diff) | |
download | Nim-97f54745459b8651b7a38c174b3a8135224ebd09.tar.gz |
fix generics treating symchoice symbols as uninstantiated (#23860)
fixes #23853 Since #22610 generics turns the `Name` in the `GT.Name` expression in the test code into a sym choice. The problem is when the compiler tries to instantiate `GT.Name` it also instantiates the sym choice symbols. `Name` has type `template (E: type ExtensionField)` which contains the unresolved generic type `ExtensionField`, which the compiler mistakes as an uninstantiated node, when it's just part of the type of the template. The compilation of the node itself and hence overloading will handle the instantiation of the proc, so we avoid instantiating it in `semtypinst`, similar to how the first nodes of call nodes aren't instantiated.
Diffstat (limited to 'compiler/semtypinst.nim')
-rw-r--r-- | compiler/semtypinst.nim | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim index f0ce8d76f..e87a4939a 100644 --- a/compiler/semtypinst.nim +++ b/compiler/semtypinst.nim @@ -132,9 +132,13 @@ proc prepareNode(cl: var TReplTypeVars, n: PNode): PNode = else: replaceTypeVarsS(cl, n.sym, replaceTypeVarsT(cl, n.sym.typ)) let isCall = result.kind in nkCallKinds + # don't try to instantiate symchoice symbols, they can be + # generic procs which the compiler will think are uninstantiated + # because their type will contain uninstantiated params + let isSymChoice = result.kind in nkSymChoices for i in 0..<n.safeLen: # XXX HACK: ``f(a, b)``, avoid to instantiate `f` - if isCall and i == 0: result.add(n[i]) + if isSymChoice or (isCall and i == 0): result.add(n[i]) else: result.add(prepareNode(cl, n[i])) proc isTypeParam(n: PNode): bool = |