(cherry picked from commit e98efdcc5e)
This commit is contained in:
metagn
2022-12-06 00:52:49 +03:00
committed by narimiran
parent c641273606
commit bc3e964e9d
2 changed files with 24 additions and 3 deletions

View File

@@ -754,9 +754,10 @@ proc semRecordNodeAux(c: PContext, n: PNode, check: var IntSet, pos: var int,
if n == nil: return
case n.kind
of nkRecWhen:
var a = copyTree(n)
var branch: PNode = nil # the branch to take
for i in 0..<n.len:
var it = n[i]
for i in 0..<a.len:
var it = a[i]
if it == nil: illFormedAst(n, c.config)
var idx = 1
case it.kind
@@ -782,7 +783,7 @@ proc semRecordNodeAux(c: PContext, n: PNode, check: var IntSet, pos: var int,
semRecordNodeAux(c, it[idx], newCheck, newPos, newf, rectype, hasCaseFields)
it[idx] = if newf.len == 1: newf[0] else: newf
if c.inGenericContext > 0:
father.add n
father.add a
elif branch != nil:
semRecordNodeAux(c, branch, check, pos, father, rectype, hasCaseFields)
elif father.kind in {nkElse, nkOfBranch}:

20
tests/generics/t16639.nim Normal file
View File

@@ -0,0 +1,20 @@
discard """
action: compile
"""
type Foo[T] = object
when true:
x: float
type Bar = object
when true:
x: float
import std/macros
macro test() =
let a = getImpl(bindSym"Foo")[^1]
let b = getImpl(bindSym"Bar")[^1]
doAssert treeRepr(a) == treeRepr(b)
test()