fix #15959

nim-lang · Nov 15, 2020 · dc1bf1e · dc1bf1e
1 parent c1664f9
commit dc1bf1e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
@@ -1513,6 +1513,9 @@ proc semSubscript(c: PContext, n: PNode, flags: TExprFlags): PNode =
       result = n
     else:
       result = nil
+  of tyGenericParam:
+    result = n
+    result.typ = makeTypeFromExpr(c, n.copyTree)
   else:
     let s = if n[0].kind == nkSym: n[0].sym
             elif n[0].kind in nkSymChoices: n[0][0].sym

diff --git a/compiler/semtypinst.nim b/compiler/semtypinst.nim
@@ -538,14 +538,17 @@ proc replaceTypeVarsTAux(cl: var TReplTypeVars, t: PType): PType =
     assert t.n.typ != t
     var n = prepareNode(cl, t.n)
     if n.kind != nkEmpty:
-      n = cl.c.semConstExpr(cl.c, n)
-    if n.typ.kind == tyTypeDesc:
+      n = cl.c.semExpr(cl.c, n)
+    case n.typ.kind
+    of ConcreteTypes: result = n.typ
+    of tyTypeDesc:
       # XXX: sometimes, chained typedescs enter here.
       # It may be worth investigating why this is happening,
       # because it may cause other bugs elsewhere.
       result = n.typ.skipTypes({tyTypeDesc})
       # result = n.typ.base
     else:
+      n = cl.c.semConstExpr(cl.c, n)
       if n.typ.kind != tyStatic:
         # XXX: In the future, semConstExpr should
         # return tyStatic values to let anyone make