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

fixes #12264 [backport] (#12302)

Browse source
This commit is contained in:
Andreas Rumpf 2019-09-30 21:44:24 +02:00 • committed by GitHub
commit dd082b6ec8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/int128.nim
View file

@ -73,6 +73,15 @@ proc toInt64*(arg: Int128): int64 =
cast[int64](bitconcat(arg.udata[1], arg.udata[0])) cast[int64](bitconcat(arg.udata[1], arg.udata[0]))
proc toInt64Checked*(arg: Int128; onError: int64): int64 =
if isNegative(arg):
if arg.sdata(3) != -1 or arg.sdata(2) != -1:
return onError
else:
if arg.sdata(3) != 0 or arg.sdata(2) != 0:
return onError
return cast[int64](bitconcat(arg.udata[1], arg.udata[0]))
proc toInt32*(arg: Int128): int32 = proc toInt32*(arg: Int128): int32 =
if isNegative(arg): if isNegative(arg):
assert(arg.sdata(3) == -1, "out of range") assert(arg.sdata(3) == -1, "out of range")

11
compiler/sizealignoffsetimpl.nim
View file

@ -21,6 +21,7 @@ const
szUnknownSize* = -3 szUnknownSize* = -3
szIllegalRecursion* = -2 szIllegalRecursion* = -2
szUncomputedSize* = -1 szUncomputedSize* = -1
szTooBigSize* = -4
type IllegalTypeRecursionError = object of Exception type IllegalTypeRecursionError = object of Exception
@ -33,14 +34,14 @@ type
offset: int offset: int
proc inc(arg: var OffsetAccum; value: int) = proc inc(arg: var OffsetAccum; value: int) =
if unlikely(value == szIllegalRecursion): raiseIllegalTypeRecursion() if unlikely(value == szIllegalRecursion): raiseIllegalTypeRecursion()
if value == szUnknownSize or arg.offset == szUnknownSize: if value == szUnknownSize or arg.offset == szUnknownSize:
arg.offset = szUnknownSize arg.offset = szUnknownSize
else: else:
arg.offset += value arg.offset += value
proc alignmentMax(a,b: int): int = proc alignmentMax(a,b: int): int =
if unlikely(a == szIllegalRecursion or b == szIllegalRecursion): raiseIllegalTypeRecursion() if unlikely(a == szIllegalRecursion or b == szIllegalRecursion): raiseIllegalTypeRecursion()
if a == szUnknownSize or b == szUnknownSize: if a == szUnknownSize or b == szUnknownSize:
szUnknownSize szUnknownSize
else: else:
@ -57,7 +58,7 @@ proc align(arg: var OffsetAccum; value: int) =
proc mergeBranch(arg: var OffsetAccum; value: OffsetAccum) = proc mergeBranch(arg: var OffsetAccum; value: OffsetAccum) =
if value.maxAlign == szUnknownSize or arg.maxAlign == szUnknownSize or if value.maxAlign == szUnknownSize or arg.maxAlign == szUnknownSize or
value.offset == szUnknownSize or arg.offset == szUnknownSize: value.offset == szUnknownSize or arg.offset == szUnknownSize:
arg.maxAlign = szUnknownSize arg.maxAlign = szUnknownSize
arg.offset = szUnknownSize arg.offset = szUnknownSize
else: else:
@ -111,7 +112,7 @@ proc setOffsetsToUnknown(n: PNode) =
for i in 0 ..< safeLen(n): for i in 0 ..< safeLen(n):
setOffsetsToUnknown(n[i]) setOffsetsToUnknown(n[i])
proc computeObjectOffsetsFoldFunction(conf: ConfigRef; n: PNode, packed: bool, accum: var OffsetAccum): void = proc computeObjectOffsetsFoldFunction(conf: ConfigRef; n: PNode, packed: bool, accum: var OffsetAccum) =
## ``offset`` is the offset within the object, after the node has been written, no padding bytes added ## ``offset`` is the offset within the object, after the node has been written, no padding bytes added
## ``align`` maximum alignment from all sub nodes ## ``align`` maximum alignment from all sub nodes
assert n != nil assert n != nil
@ -256,7 +257,7 @@ proc computeSizeAlign(conf: ConfigRef; typ: PType) =
typ.size = elemSize typ.size = elemSize
typ.align = int16(elemSize) typ.align = int16(elemSize)
else: else:
typ.size = toInt64(lengthOrd(conf, typ.sons[0]) * int32(elemSize)) typ.size = toInt64Checked(lengthOrd(conf, typ.sons[0]) * int32(elemSize), szTooBigSize)
typ.align = typ.sons[1].align typ.align = typ.sons[1].align
of tyUncheckedArray: of tyUncheckedArray:

7
compiler/types.nim
View file

@ -814,11 +814,8 @@ proc floatRangeCheck*(x: BiggestFloat, t: PType): bool =
false false
proc lengthOrd*(conf: ConfigRef; t: PType): Int128 = proc lengthOrd*(conf: ConfigRef; t: PType): Int128 =
case t.skipTypes(tyUserTypeClasses).kind if t.skipTypes(tyUserTypeClasses).kind == tyDistinct:
of tyInt64, tyInt32, tyInt: result = lengthOrd(conf, t.sons[0])
# XXX: this is just wrong
result = lastOrd(conf, t)
of tyDistinct: result = lengthOrd(conf, t.sons[0])
else: else:
let last = lastOrd(conf, t) let last = lastOrd(conf, t)
let first = firstOrd(conf, t) let first = firstOrd(conf, t)