jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes #20227; skip distinct types for genObjConstr [JS backend] (#20229)

Browse source 
fixes #20227; skip distinct types for genObjConstr
This commit is contained in:
ringabout 2022-08-24 19:31:44 +08:00 • committed by GitHub
commit e832fea160
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/jsgen.nim
View file

@ -2272,6 +2272,7 @@ proc genObjConstr(p: PProc, n: PNode, r: var TCompRes) =
r.kind = resExpr r.kind = resExpr
var initList : Rope var initList : Rope
var fieldIDs = initIntSet() var fieldIDs = initIntSet()
let nTyp = n.typ.skipTypes(abstractInst)
for i in 1..<n.len: for i in 1..<n.len:
if i > 1: initList.add(", ") if i > 1: initList.add(", ")
var it = n[i] var it = n[i]
@ -2280,7 +2281,7 @@ proc genObjConstr(p: PProc, n: PNode, r: var TCompRes) =
gen(p, val, a) gen(p, val, a)
var f = it[0].sym var f = it[0].sym
if f.loc.r == nil: f.loc.r = mangleName(p.module, f) if f.loc.r == nil: f.loc.r = mangleName(p.module, f)
fieldIDs.incl(lookupFieldAgain(n.typ, f).id) fieldIDs.incl(lookupFieldAgain(nTyp, f).id)
let typ = val.typ.skipTypes(abstractInst) let typ = val.typ.skipTypes(abstractInst)
if a.typ == etyBaseIndex: if a.typ == etyBaseIndex:

17
tests/stdlib/tmisc_issues.nim Normal file
View file

@ -0,0 +1,17 @@
discard """
targets: "c cpp js"
"""
# bug #20227
type
Data = object
id: int
Test = distinct Data
Object = object
data: Test
var x: Object = Object(data: Test(Data(id: 12)))
doAssert Data(x.data).id == 12