mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-07 21:43:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Align treetab hash with equivalence (#25354)

Browse Source 
In particular, hash `typ` for `nkType`, `nkNilLit` or they end up
generating collisions

<img width="989" height="612" alt="image"
src="https://github.com/user-attachments/assets/a5c6366f-1214-443e-98d5-52ce95fc3555"
/>
This commit is contained in:
Jacek Sieka
2025-12-15 13:19:56 +01:00
committed by araq
parent b878a4f444
commit a92a96fadb
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
compiler/treetab.nim
View File

@@ -21,20 +21,13 @@ proc hashTree*(n: PNode): Hash =
return
result = ord(n.kind)
case n.kind
of nkEmpty, nkNilLit, nkType:
discard
of nkIdent:
result = result !& n.ident.h
of nkSym:
result = result !& n.sym.id
of nkCharLit..nkUInt64Lit:
if (n.intVal >= low(int)) and (n.intVal <= high(int)):
result = result !& int(n.intVal)
of nkFloatLit..nkFloat64Lit:
if (n.floatVal >= - 1000000.0) and (n.floatVal <= 1000000.0):
result = result !& toInt(n.floatVal)
of nkStrLit..nkTripleStrLit:
result = result !& hash(n.strVal)
of nkEmpty: discard
of nkSym: result = result !& n.sym.id
of nkIdent: result = result !& n.ident.h
of nkCharLit..nkUInt64Lit: result = result !& hash(n.intVal)
of nkFloatLit..nkFloat64Lit: result = result !& hash(cast[uint64](n.floatVal))
of nkStrLit..nkTripleStrLit: result = result !& hash(n.strVal)
of nkType, nkNilLit: result = result !& hash(n.typ.itemId)
else:
for i in 0..<n.len:
result = result !& hashTree(n[i])
@@ -53,7 +46,6 @@ proc treesEquivalent(a, b: PNode; ignoreTypes: bool): bool =
of nkCharLit..nkUInt64Lit: result = a.intVal == b.intVal
of nkFloatLit..nkFloat64Lit:
result = cast[uint64](a.floatVal) == cast[uint64](b.floatVal)
#result = a.floatVal == b.floatVal
of nkStrLit..nkTripleStrLit: result = a.strVal == b.strVal
of nkType, nkNilLit:
result = a.typ == b.typ