fixes #18983 #5282 #13008; recursive types casue infinite type (#20172)

* fixes #18983 #5282 #13008; recursive types casue infinite type

* re

* add testcases

(cherry picked from commit a895bbf714)
This commit is contained in:
ringabout
2022-08-24 01:58:50 +08:00
committed by narimiran
parent b92336ab33
commit 7acdacb253
3 changed files with 39 additions and 2 deletions

View File

@@ -212,10 +212,34 @@ proc semVarOutType(c: PContext, n: PNode, prev: PType; kind: TTypeKind): PType =
else:
result = newConstraint(c, kind)
proc isRecursiveType(t: PType, cycleDetector: var IntSet): bool =
if t == nil:
return false
if cycleDetector.containsOrIncl(t.id):
return true
case t.kind
of tyAlias, tyGenericInst, tyDistinct:
return isRecursiveType(t.lastSon, cycleDetector)
else:
return false
proc isRecursiveType*(t: PType): bool =
# handle simple recusive types before typeFinalPass
var cycleDetector = initIntSet()
isRecursiveType(t, cycleDetector)
proc addSonSkipIntLitChecked(c: PContext; father, son: PType; it: PNode, id: IdGenerator) =
let s = son.skipIntLit(id)
father.sons.add(s)
if isRecursiveType(s):
localError(c.config, it.info, "illegal recursion in type '" & typeToString(s) & "'")
else:
propagateToOwner(father, s)
proc semDistinct(c: PContext, n: PNode, prev: PType): PType =
if n.len == 0: return newConstraint(c, tyDistinct)
result = newOrPrevType(tyDistinct, prev, c)
addSonSkipIntLit(result, semTypeNode(c, n[0], nil), c.idgen)
addSonSkipIntLitChecked(c, result, semTypeNode(c, n[0], nil), n[0], c.idgen)
if n.len > 1: result.n = n[1]
proc semRangeAux(c: PContext, n: PNode, prev: PType): PType =
@@ -447,7 +471,8 @@ proc semAnonTuple(c: PContext, n: PNode, prev: PType): PType =
localError(c.config, n.info, errTypeExpected)
result = newOrPrevType(tyTuple, prev, c)
for it in n:
addSonSkipIntLit(result, semTypeNode(c, it, nil), c.idgen)
let t = semTypeNode(c, it, nil)
addSonSkipIntLitChecked(c, result, t, it, c.idgen)
proc semTuple(c: PContext, n: PNode, prev: PType): PType =
var typ: PType

7
tests/errmsgs/t18983.nim Normal file
View File

@@ -0,0 +1,7 @@
discard """
errormsg: "illegal recursion in type 'A'"
"""
type
A* = A
B = (A,)

5
tests/errmsgs/t5282.nim Normal file
View File

@@ -0,0 +1,5 @@
discard """
errormsg: "illegal recursion in type 'x'"
"""
type x = distinct x