jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Destructor lifting fixes #11149 (#11163)

Browse source 
* fixes #11149

* add test
This commit is contained in:
cooldome 2019-05-04 22:34:37 +02:00 • committed by Andreas Rumpf
commit d3db189eb4
4 changed files with 77 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/sighashes.nim
View file

@ -36,6 +36,7 @@ type
CoOwnerSig
CoIgnoreRange
CoConsiderOwned
CoDistinct
proc hashType(c: var MD5Context, t: PType; flags: set[ConsiderFlag])
@ -97,7 +98,11 @@ proc hashType(c: var MD5Context, t: PType; flags: set[ConsiderFlag]) =
for i in countup(0, sonsLen(t) - 1):
c.hashType t.sons[i], flags
of tyDistinct:
if {CoType, CoConsiderOwned} * flags == {CoType} or t.sym == nil:
if CoDistinct in flags:
if t.sym != nil: c.hashSym(t.sym)
if t.sym == nil or tfFromGeneric in t.flags:
c.hashType t.lastSon, flags
elif CoType in flags or t.sym == nil:
c.hashType t.lastSon, flags
else:
c.hashSym(t.sym)