fixes nim-lang#13378 [backport] (nim-lang#13392)

(cherry picked from commit c446c0f)
narimiran · Feb 19, 2020 · 14e1f82 · 14e1f82
1 parent 2304af2
commit 14e1f82
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
@@ -1945,6 +1945,8 @@ proc localConvMatch(c: PContext, m: var TCandidate, f, a: PType,
 
   if result != nil:
     if result.typ == nil: return nil
+    # bug #13378, ensure we produce a real generic instantiation:
+    result = c.semExpr(c, call)
     # resulting type must be consistent with the other arguments:
     var r = typeRel(m, f.sons[0], result.typ)
     if r < isGeneric: return nil

diff --git a/tests/generics/tgeneric0.nim b/tests/generics/tgeneric0.nim
@@ -4,6 +4,7 @@ discard """
 0
 float32
 float32
+(name: "Resource 1", readers: ..., writers: ...)
 '''
 """
 
@@ -124,3 +125,18 @@ block tgeneric5:
     echo T
 
   bar(0.0'f32)
+
+# bug #13378
+
+type
+  Resource = ref object of RootObj
+    name: string
+    readers, writers: seq[RenderTask]
+
+  RenderTask = ref object
+    name: string
+
+var res = Resource(name: "Resource 1")
+
+(proc (r: typeof(res)) =
+   echo r[])(res)