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

Alternative to #18928 (#18931)

Browse source 
* fixed #18841

* Added test
This commit is contained in:
Jason Beetham 2021-09-30 08:55:43 -06:00 • committed by GitHub
commit f915b3aa86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/semtypinst.nim
View file

@ -344,11 +344,7 @@ proc handleGenericInvocation(cl: var TReplTypeVars, t: PType): PType =
x = lookupTypeVar(cl, x)
if x != nil:
if header == t: header = instCopyType(cl, t)
header[i] =
if x.kind == tyGenericInst:
t[i]
else:
x
header[i] = x
propagateToOwner(header, x)
else:
propagateToOwner(header, x)
@ -382,7 +378,11 @@ proc handleGenericInvocation(cl: var TReplTypeVars, t: PType): PType =
cl.typeMap = newTypeMapLayer(cl)
for i in 1..<t.len:
var x = replaceTypeVarsT(cl, header[i])
var x = replaceTypeVarsT(cl):
if header[i].kind == tyGenericInst:
t[i]
else:
header[i]
assert x.kind != tyGenericInvocation
header[i] = x
propagateToOwner(header, x)