Merge pull request #18 from nim-lang/devel

fixes nim-lang#12964 (nim-lang#13027)
sthagen · Jan 4, 2020 · b490442 · b490442
2 parents efbee36 + 0f6987a
commit b490442
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim
@@ -1863,11 +1863,11 @@ proc implicitConv(kind: TNodeKind, f: PType, arg: PNode, m: TCandidate,
   result = newNodeI(kind, arg.info)
   if containsGenericType(f):
     if not m.hasFauxMatch:
-      result.typ = getInstantiatedType(c, arg, m, f)
+      result.typ = getInstantiatedType(c, arg, m, f).skipTypes({tySink})
     else:
       result.typ = errorType(c)
   else:
-    result.typ = f
+    result.typ = f.skipTypes({tySink})
   if result.typ == nil: internalError(c.graph.config, arg.info, "implicitConv")
   result.add c.graph.emptyNode
   result.add arg

diff --git a/tests/destructor/tarc.nim b/tests/destructor/tarc.nim
@@ -100,4 +100,18 @@ mkManyLeaks()
 tsimpleClosureIterator()
 tleakingNewStmt()
 leakObjConstr()
+
+# bug #12964
+
+type
+  Token* = ref object of RootObj
+  Li* = ref object of Token
+
+proc bug12964*() =
+  var token = Li()
+  var tokens = @[Token()]
+  tokens.add token
+
+bug12964()
+
 echo getOccupiedMem() - startMem