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

fix #20829 Regression in int64 type matching since (#21019)

Browse source 
fix #20829 Regression in int64 type matching
This commit is contained in:
Bung 2022-12-06 14:44:54 +08:00 • committed by GitHub
commit 5d469686b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/sigmatch.nim
View file

@ -395,9 +395,9 @@ proc handleRange(c: PContext, f, a: PType, min, max: TTypeKind): TTypeRelation =
result = isIntConv result = isIntConv
elif a.kind == tyUInt and nf == c.config.targetSizeUnsignedToKind: elif a.kind == tyUInt and nf == c.config.targetSizeUnsignedToKind:
result = isIntConv result = isIntConv
elif f.kind == tyInt and na in {tyInt8 .. c.config.targetSizeSignedToKind}: elif f.kind == tyInt and na in {tyInt8 .. pred(c.config.targetSizeSignedToKind)}:
result = isIntConv result = isIntConv
elif f.kind == tyUInt and na in {tyUInt8 .. c.config.targetSizeUnsignedToKind}: elif f.kind == tyUInt and na in {tyUInt8 .. pred(c.config.targetSizeUnsignedToKind)}:
result = isIntConv result = isIntConv
elif k >= min and k <= max: elif k >= min and k <= max:
result = isConvertible result = isConvertible
@ -2116,6 +2116,8 @@ proc paramTypesMatchAux(m: var TCandidate, f, a: PType,
case r case r
of isConvertible: of isConvertible:
if f.skipTypes({tyRange}).kind in {tyInt, tyUInt}:
inc(m.convMatches)
inc(m.convMatches) inc(m.convMatches)
result = implicitConv(nkHiddenStdConv, f, arg, m, c) result = implicitConv(nkHiddenStdConv, f, arg, m, c)
of isIntConv: of isIntConv:

12
tests/arithm/t1.nim
View file

@ -1,2 +1,14 @@
doAssert typeOf(1.int64 + 1.int) is int64 doAssert typeOf(1.int64 + 1.int) is int64
doAssert typeOf(1.uint64 + 1.uint) is uint64 doAssert typeOf(1.uint64 + 1.uint) is uint64
doAssert int64 is SomeNumber
doAssert int64 is (SomeNumber and not(uint32|uint64|uint|int))
doAssert int64 is (not(uint32|uint64|uint|int))
doAssert int isnot int64
doAssert int64 isnot int
var myInt16 = 5i16
var myInt: int
doAssert typeOf(myInt16 + 34) is int16 # of type `int16`
doAssert typeOf(myInt16 + myInt) is int # of type `int`
doAssert typeOf(myInt16 + 2i32) is int32 # of type `int32`
doAssert int32 isnot int64
doAssert int32 isnot int