Skip to content
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

fix infinite recursion in typeRel #15241

Merged
merged 19 commits into from
Sep 18, 2020
Merged

fix infinite recursion in typeRel #15241

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
00e76ca
fix some issues overloading with generics and inheritance
jcosborn Aug 22, 2020
2716d03
fix passing procs with subtype matches
jcosborn Aug 22, 2020
2614f39
fix infinite recursion in typeRel
jcosborn Aug 29, 2020
1e84547
Merge
jcosborn Aug 29, 2020
5bcab59
Merge devel
jcosborn Aug 29, 2020
3617c7d
avoid megatest
jcosborn Sep 15, 2020
81225ba
try to get tests to work
jcosborn Sep 15, 2020
bc16e1f
try reverting change to see if tests work
Sep 15, 2020
6b26c14
remove test
Sep 15, 2020
a1cb5f9
add part of the test back
Sep 15, 2020
a751661
try again
Sep 15, 2020
ec8de4b
add more
Sep 15, 2020
7dee018
change static syntax
Sep 15, 2020
d0c470c
try again
Sep 15, 2020
8f6f4d5
try distinct
Sep 15, 2020
d29a035
try full fix with updated test
Sep 15, 2020
343ce59
propagate flags in typeRel
jcosborn Sep 17, 2020
8096053
fix binding in generic constraints
jcosborn Sep 17, 2020
a2435e3
fix generic constraints
jcosborn Sep 17, 2020
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
2 changes: 1 addition & 1 deletion compiler/sigmatch.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,7 +1091,7 @@ proc typeRel(c: var TCandidate, f, aOrig: PType,

template considerPreviousT(body: untyped) =
var prev = PType(idTableGet(c.bindings, f))
if prev == nil: body
if prev == nil or prev == f: body
Araq marked this conversation as resolved.
Show resolved Hide resolved
else: return typeRel(c, prev, a)

case a.kind
Expand Down
19 changes: 19 additions & 0 deletions tests/overload/toverload_various.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ block:
template t0(x: Bar[int]): int = 1
template t0(x: Foo[bool or int]): int = 10
template t0(x: Bar[bool or int]): int = 11
#template t0[T:bool or int](x: Bar[T]): int = 11
template t0[T](x: Foo[T]): int = 20
template t0[T](x: Bar[T]): int = 21
proc p0(x: Foo[int]): int = 0
Expand Down Expand Up @@ -461,3 +462,21 @@ block:
doAssert(p0(g) == 20)
doAssert(p0(h) == 21)
doAssert(p0(i) == 21)

#type
# f0 = proc(x:Foo)

block:
type
TilesetCT[n: static[int]] = distinct int
TilesetRT = int
Tileset = TilesetCT | TilesetRT

func prepareTileset(tileset: var Tileset) = discard

func prepareTileset(tileset: Tileset): Tileset =
result = tileset
result.prepareTileset

var parsedTileset: TilesetRT
prepareTileset(parsedTileset)