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

int128 on firstOrd, lastOrd and lengthOrd (#11701)

Browse source 
* fixes #11847
This commit is contained in:
Arne Döring 2019-08-07 15:53:16 +02:00 • committed by Andreas Rumpf
commit afbcd1b330
34 changed files with 530 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/sizealignoffsetimpl.nim
View file

@ -332,7 +332,7 @@ proc computeSizeAlign(conf: ConfigRef; typ: PType) =
typ.size = elemSize
typ.align = int16(elemSize)
else:
typ.size = lengthOrd(conf, typ.sons[0]) * elemSize
typ.size = toInt64(lengthOrd(conf, typ.sons[0]) * int32(elemSize))
typ.align = typ.sons[1].align
of tyUncheckedArray:
@ -341,11 +341,11 @@ proc computeSizeAlign(conf: ConfigRef; typ: PType) =
typ.size = 0
typ.align = base.align
of tyEnum:
if firstOrd(conf, typ) < 0:
if firstOrd(conf, typ) < Zero:
typ.size = 4 # use signed int32
typ.align = 4
else:
length = lastOrd(conf, typ) # BUGFIX: use lastOrd!
length = toInt64(lastOrd(conf, typ)) # BUGFIX: use lastOrd!
if length + 1 < `shl`(1, 8):
typ.size = 1
typ.align = 1
@ -363,7 +363,7 @@ proc computeSizeAlign(conf: ConfigRef; typ: PType) =
typ.size = szUncomputedSize
typ.align = szUncomputedSize # in original version this was 1
else:
length = lengthOrd(conf, typ.sons[0])
length = toInt64(lengthOrd(conf, typ.sons[0]))
if length <= 8:
typ.size = 1
elif length <= 16: