Skip to content

fixes #25174; tyOr handling in tyBuiltInTypeClass branch of typeRel #25177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: devel
Choose a base branch
from
+35 −5
Open

fixes #25174; tyOr handling in tyBuiltInTypeClass branch of typeRel #25177

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a90fe0
fix temp
Graveflo Sep 17, 2025
8644fca
add test
Graveflo Sep 17, 2025
bc88a53
simplify
Graveflo Sep 17, 2025
bbeeb4e
adjust generic inv
Graveflo Sep 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions compiler/sigmatch.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1891,6 +1891,21 @@ proc typeRel(c: var TCandidate, f, aOrig: PType,
return isNone
if doBind: put(c, f, a)
return isGeneric
elif effectiveArgType.kind == tyOr:
let oldInheritancePenalty = c.inheritancePenalty
var
bestPenatly = maxInheritancePenalty
bestMatch = isNone
for kid in effectiveArgType.kids:
let x = typeRel(c, f, kid, flags)
if x > bestMatch:
bestMatch = x
bestPenatly = c.inheritancePenalty
c.inheritancePenalty = oldInheritancePenalty
c.inheritancePenalty = oldInheritancePenalty
if bestMatch > isNone:
c.inheritancePenalty = bestPenatly
result = bestMatch
Copy link
Member

@Araq Araq Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? Instead the later disambiguation phase should pick it up.

Copy link
Contributor Author

@Graveflo Graveflo Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC the later phases actually don't handle tyOr precisely. You're right though, if I made this unique I probably shouldn't have. I think the failures are coming from binding issues. Might be a deeper problem here unfortunately.

else:
return isNone
of tyUserTypeClassInst, tyUserTypeClass:
Expand Down
13 changes: 13 additions & 0 deletions tests/typerel/tsigmatch.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,16 @@ block: # bug #13618

doAssert test(^1) == 1
doAssert test(1) == 1

block: # #25174
type Foo = object
type Bar = object
type Quz = object

proc bar[T: Foo | Bar](x: T): string =
return $typeof(T)
proc bar[T: object](x: T): string =
return $typeof(T)
doAssert bar(Foo()) == "Foo"
doAssert bar(Bar()) == "Bar"
doAssert bar(Quz()) == "Quz"
Loading