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

fix #15752 (#15754)

Browse source
This commit is contained in:
cooldome 2020-10-27 23:09:26 +00:00 • committed by GitHub
commit f8cac6bbbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/sizealignoffsetimpl.nim
View file

@ -277,14 +277,14 @@ proc computeSizeAlign(conf: ConfigRef; typ: PType) =
typ.size = 4 # use signed int32 typ.size = 4 # use signed int32
typ.align = 4 typ.align = 4
else: else:
let length = toInt64(lastOrd(conf, typ)) # BUGFIX: use lastOrd! let lastOrd = toInt64(lastOrd(conf, typ)) # BUGFIX: use lastOrd!
if length + 1 < `shl`(1, 8): if lastOrd < `shl`(1, 8):
typ.size = 1 typ.size = 1
typ.align = 1 typ.align = 1
elif length + 1 < `shl`(1, 16): elif lastOrd < `shl`(1, 16):
typ.size = 2 typ.size = 2
typ.align = 2 typ.align = 2
elif length + 1 < `shl`(BiggestInt(1), 32): elif lastOrd < `shl`(BiggestInt(1), 32):
typ.size = 4 typ.size = 4
typ.align = 4 typ.align = 4
else: else:

9
tests/enum/tenum.nim
View file

@ -154,3 +154,12 @@ block nonzero: # bug #6959
B B
C C
let slice = SomeEnum.low..SomeEnum.high let slice = SomeEnum.low..SomeEnum.high
block size_one_byte: #issue 15752
type
Flag = enum
Disabled = 0x00
Enabled = 0xFF
static:
assert 1 == sizeof(Flag)