mirror of
https://github.com/nim-lang/Nim.git
synced 2025-12-28 17:04:41 +00:00
fixes #3112
This commit is contained in:
@@ -90,6 +90,7 @@ type
|
||||
allowMetaTypes*: bool # allow types such as seq[Number]
|
||||
# i.e. the result contains unresolved generics
|
||||
skipTypedesc*: bool # wether we should skip typeDescs
|
||||
recursionLimit: int
|
||||
|
||||
proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType
|
||||
proc replaceTypeVarsS(cl: var TReplTypeVars, s: PSym): PSym
|
||||
@@ -365,6 +366,19 @@ proc propagateFieldFlags(t: PType, n: PNode) =
|
||||
else: discard
|
||||
|
||||
proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType =
|
||||
template bailout =
|
||||
if cl.recursionLimit > 100:
|
||||
# bail out, see bug #2509. But note this caching is in general wrong,
|
||||
# look at this example where TwoVectors should not share the generic
|
||||
# instantiations (bug #3112):
|
||||
|
||||
# type
|
||||
# Vector[N: static[int]] = array[N, float64]
|
||||
# TwoVectors[Na, Nb: static[int]] = (Vector[Na], Vector[Nb])
|
||||
result = PType(idTableGet(cl.localCache, t))
|
||||
if result != nil: return result
|
||||
inc cl.recursionLimit
|
||||
|
||||
result = t
|
||||
if t == nil: return
|
||||
|
||||
@@ -420,8 +434,7 @@ proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType =
|
||||
result = t
|
||||
|
||||
of tyGenericInst:
|
||||
result = PType(idTableGet(cl.localCache, t))
|
||||
if result != nil: return result
|
||||
bailout()
|
||||
result = instCopyType(cl, t)
|
||||
idTablePut(cl.localCache, t, result)
|
||||
for i in 1 .. <result.sonsLen:
|
||||
@@ -431,8 +444,7 @@ proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType =
|
||||
else:
|
||||
if containsGenericType(t):
|
||||
#if not cl.allowMetaTypes:
|
||||
result = PType(idTableGet(cl.localCache, t))
|
||||
if result != nil: return result
|
||||
bailout()
|
||||
result = instCopyType(cl, t)
|
||||
result.size = -1 # needs to be recomputed
|
||||
#if not cl.allowMetaTypes:
|
||||
|
||||
@@ -1,17 +1,39 @@
|
||||
discard """
|
||||
output: '''0
|
||||
0
|
||||
2
|
||||
100'''
|
||||
"""
|
||||
|
||||
type
|
||||
RectArray*[R, C: static[int], T] = distinct array[R * C, T]
|
||||
|
||||
|
||||
StaticMatrix*[R, C: static[int], T] = object
|
||||
elements*: RectArray[R, C, T]
|
||||
|
||||
|
||||
StaticVector*[N: static[int], T] = StaticMatrix[N, 1, T]
|
||||
|
||||
|
||||
proc foo*[N, T](a: StaticVector[N, T]): T = 0.T
|
||||
proc foobar*[N, T](a, b: StaticVector[N, T]): T = 0.T
|
||||
|
||||
|
||||
|
||||
|
||||
var a: StaticVector[3, int]
|
||||
|
||||
|
||||
echo foo(a) # OK
|
||||
echo foobar(a, a) # <--- hangs compiler
|
||||
echo foobar(a, a) # <--- hangs compiler
|
||||
|
||||
# bug #3112
|
||||
|
||||
type
|
||||
Vector[N: static[int]] = array[N, float64]
|
||||
TwoVectors[Na, Nb: static[int]] = tuple
|
||||
a: Vector[Na]
|
||||
b: Vector[Nb]
|
||||
|
||||
when isMainModule:
|
||||
var v: TwoVectors[2, 100]
|
||||
echo v[0].len
|
||||
echo v[1].len
|
||||
#let xx = 50
|
||||
v[1][50] = 0.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user