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

fixes #13195 (#13198)

Browse source 
* fixes #13195

* extra fix

* fix typo
This commit is contained in:
cooldome 2020-01-20 09:41:12 +00:00 • committed by Andreas Rumpf
commit da1bddb084
3 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/ccgtypes.nim
View file

@ -525,7 +525,8 @@ proc genRecordFieldsAux(m: BModule, n: PNode,
of nkOfBranch, nkElse:
let k = lastSon(n[i])
if k.kind != nkSym:
let a = genRecordFieldsAux(m, k, rectype, check, unionPrefix & "_i" & $i & ".")
let structName = "_" & mangleRecFieldName(m, n[0].sym) & "_" & $i
let a = genRecordFieldsAux(m, k, rectype, check, unionPrefix & $structName & ".")
if a != nil:
if tfPacked notin rectype.flags:
unionBody.add("struct {")
@ -535,7 +536,7 @@ proc genRecordFieldsAux(m: BModule, n: PNode,
else:
unionBody.addf("#pragma pack(push, 1)$nstruct{", [])
unionBody.add(a)
unionBody.addf("} _i$1;$n", [rope($i)])
unionBody.addf("} $1;$n", [structName])
if tfPacked in rectype.flags and hasAttribute notin CC[m.config.cCompiler].props:
unionBody.addf("#pragma pack(pop)$n", [])
else: