mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-06-05 03:14:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

tgettypeinst works again; fixes an infinite recursion in signature hashing

Browse Source
This commit is contained in:
Andreas Rumpf
2016-12-06 13:01:56 +01:00
parent 36a9703866
commit 066fbaf271
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/sighashes.nim
View File

@@ -122,6 +122,7 @@ type
ConsiderFlag* = enum
CoProc
CoType
CoNoGeneric
proc hashType(c: var MD5Context, t: PType; flags: set[ConsiderFlag]) =
if t == nil:
@@ -144,7 +145,6 @@ proc hashType(c: var MD5Context, t: PType; flags: set[ConsiderFlag]) =
return
else:
discard
c &= char(t.kind)
case t.kind
of tyBool, tyChar, tyInt..tyUInt64:
@@ -153,10 +153,10 @@ proc hashType(c: var MD5Context, t: PType; flags: set[ConsiderFlag]) =
if t.sym != nil and {sfImportc, sfExportc} * t.sym.flags != {}:
c.hashSym(t.sym)
of tyObject, tyEnum:
if t.typeInst != nil:
if t.typeInst != nil and CoNoGeneric notin flags:
assert t.typeInst.kind == tyGenericInst
for i in countup(1, sonsLen(t.typeInst) - 2):
c.hashType t.typeInst.sons[i], flags
c.hashType t.typeInst.sons[i], flags+{CoNoGeneric}
# Every cyclic type in Nim need to be constructed via some 't.sym', so this
# is actually safe without an infinite recursion check:
if t.sym != nil: