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

Fix struct packing for VCC. (#7049)

Browse source 
"#pragma pack(1)" sets current alligment without pushing into stack,
so "#pragma pack(pop)" causing stack underflow.
This commit is contained in:
sleepyqt 2018-01-10 01:02:09 +03:00 • committed by Andreas Rumpf
commit a54430ea2d
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/ccgtypes.nim
View file

@ -496,7 +496,7 @@ proc genRecordFieldsAux(m: BModule, n: PNode,
if hasAttribute in CC[cCompiler].props: if hasAttribute in CC[cCompiler].props:
add(unionBody, "struct __attribute__((__packed__)){" ) add(unionBody, "struct __attribute__((__packed__)){" )
else: else:
addf(unionBody, "#pragma pack(1)$nstruct{", []) addf(unionBody, "#pragma pack(push, 1)$nstruct{", [])
add(unionBody, a) add(unionBody, a)
addf(unionBody, "} $1;$n", [sname]) addf(unionBody, "} $1;$n", [sname])
if tfPacked in rectype.flags and hasAttribute notin CC[cCompiler].props: if tfPacked in rectype.flags and hasAttribute notin CC[cCompiler].props:
@ -551,7 +551,7 @@ proc getRecordDesc(m: BModule, typ: PType, name: Rope,
if hasAttribute in CC[cCompiler].props: if hasAttribute in CC[cCompiler].props:
result = structOrUnion(typ) & " __attribute__((__packed__))" result = structOrUnion(typ) & " __attribute__((__packed__))"
else: else:
result = "#pragma pack(1)" & tnl & structOrUnion(typ) result = "#pragma pack(push, 1)" & tnl & structOrUnion(typ)
else: else:
result = structOrUnion(typ) result = structOrUnion(typ)