fix #20829 Regression in int64 type matching
This commit is contained in:
parent
feb0481ba3
commit
5d469686b0
2 changed files with 16 additions and 2 deletions
|
|
@ -395,9 +395,9 @@ proc handleRange(c: PContext, f, a: PType, min, max: TTypeKind): TTypeRelation =
|
|||
result = isIntConv
|
||||
elif a.kind == tyUInt and nf == c.config.targetSizeUnsignedToKind:
|
||||
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
|
||||
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
|
||||
elif k >= min and k <= max:
|
||||
result = isConvertible
|
||||
|
|
@ -2116,6 +2116,8 @@ proc paramTypesMatchAux(m: var TCandidate, f, a: PType,
|
|||
|
||||
case r
|
||||
of isConvertible:
|
||||
if f.skipTypes({tyRange}).kind in {tyInt, tyUInt}:
|
||||
inc(m.convMatches)
|
||||
inc(m.convMatches)
|
||||
result = implicitConv(nkHiddenStdConv, f, arg, m, c)
|
||||
of isIntConv:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue