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

Fix #12636 (#15850)

Browse source 
* close #11142

* fix #12636

* undo unwanted changes

* fix illegal recursion case
This commit is contained in:
cooldome 2020-11-05 17:55:52 +00:00 • committed by GitHub
commit 3af7818af4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/sizealignoffsetimpl.nim
View file

@ -259,11 +259,15 @@ proc computeSizeAlign(conf: ConfigRef; typ: PType) =
of tyArray:
computeSizeAlign(conf, typ[1])
let elemSize = typ[1].size
let len = lengthOrd(conf, typ[0])
if elemSize < 0:
typ.size = elemSize
typ.align = int16(elemSize)
elif len < 0:
typ.size = szUnknownSize
typ.align = szUnknownSize
else:
typ.size = toInt64Checked(lengthOrd(conf, typ[0]) * int32(elemSize), szTooBigSize)
typ.size = toInt64Checked(len * int32(elemSize), szTooBigSize)
typ.align = typ[1].align
of tyUncheckedArray:

14
tests/misc/tsizeof.nim
View file

@ -361,6 +361,16 @@ testinstance:
y: int32
z: AnotherEnum
Stack[N: static int, T: object] = object
pad: array[128 - sizeof(array[N, ptr T]) - sizeof(int) - sizeof(pointer), byte]
stack: array[N, ptr T]
len*: int
rawMem: ptr array[N, T]
Stack2[T: object] = object
pad: array[128 - sizeof(array[sizeof(T), ptr T]), byte]
const trivialSize = sizeof(TrivialType) # needs to be able to evaluate at compile time
proc main(): void =
@ -377,6 +387,8 @@ testinstance:
var po : PaddingOfSetEnum33
var capo: MyCustomAlignPackedObject
var issue15516: MyObject
var issue12636_1: Stack[5, MyObject]
var issue12636_2: Stack2[MyObject]
var
e1: Enum1
@ -395,7 +407,7 @@ testinstance:
else:
doAssert sizeof(SimpleAlignment) > 10
testSizeAlignOf(t,a,b,c,d,e,f,g,ro,go,po, e1, e2, e4, e8, eoa, eob, capo, issue15516)
testSizeAlignOf(t,a,b,c,d,e,f,g,ro,go,po, e1, e2, e4, e8, eoa, eob, capo, issue15516, issue12636_1, issue12636_2)
type
WithBitsize {.objectconfig.} = object