mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-02-14 23:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #15752 (#15754)

Browse Source 
(cherry picked from commit f8cac6bbbc)
This commit is contained in:
cooldome
2020-10-27 23:09:26 +00:00
committed by narimiran
parent 5c48058c86
commit afb5212fe0
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.align = 4
else:
let length = toInt64(lastOrd(conf, typ)) # BUGFIX: use lastOrd!
if length + 1 < `shl`(1, 8):
let lastOrd = toInt64(lastOrd(conf, typ)) # BUGFIX: use lastOrd!
if lastOrd < `shl`(1, 8):
typ.size = 1
typ.align = 1
elif length + 1 < `shl`(1, 16):
elif lastOrd < `shl`(1, 16):
typ.size = 2
typ.align = 2
elif length + 1 < `shl`(BiggestInt(1), 32):
elif lastOrd < `shl`(BiggestInt(1), 32):
typ.size = 4
typ.align = 4
else:

9
tests/enum/tenum.nim
View File

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